aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/en-us
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml51
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml51
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_otr_options.xml44
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml82
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_dialog.xml131
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_progress.xml52
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_login.xml168
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml1
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml46
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/role_actions.xml8
21 files changed, 482 insertions, 199 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 91a63eb..8ce25a8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -2,7 +2,7 @@
2<floater can_close="true" can_drag_on_left="false" can_minimize="true" 2<floater can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" height="440" min_height="100" min_width="100" 3 can_resize="false" height="440" min_height="100" min_width="100"
4 name="floater_about" rect_control="FloaterAboutRect" 4 name="floater_about" rect_control="FloaterAboutRect"
5 title="About Second Life" width="470"> 5 title="About grid viewer" width="470">
6 <tab_container 6 <tab_container
7 follows="all" 7 follows="all"
8 bottom="10" 8 bottom="10"
@@ -30,36 +30,33 @@
30 height="386" 30 height="386"
31 help_topic="about_credits_tab" 31 help_topic="about_credits_tab"
32 name="credits_panel"> 32 name="credits_panel">
33 <text_editor bottom="6" embedded_items="false"
34 follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
35 max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
36 word_wrap="true">
37 The Imprudence Viewer was rocked hard by:
38 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, CodeBastard Redgrave and Boroondas Gupte.
39 33
40 http://kokuaviewer.org/ 34 <text_editor bottom="6" embedded_items="false"
35 follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
36 max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
37 word_wrap="true">
38 This meta-impy viewer is based on the Imprudence viewer, and brought to you by Dave and Chris.
39
40 http://onefang.net/redmine/ for bug reports, feature requests, bitching, and downloads.
41 http://github.com/onefang/meta-impy for the source code.
41 42
42 Imprudence is so awesome thanks to contributions from many generous people:
43 43
44 For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth, Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr, Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar. 44 The Imprudence Viewer was rocked hard by:
45 Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
45 46
46 For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden. 47 http://kokuaviewer.org/
47 48
48 Thanks also to the developer(s) of the Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible. 49 Imprudence is so awesome thanks to contributions from many generous people:
49 50
50 For a complete list of who did what, read the release notes! 51 For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth, Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr, Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
51 52
53 For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
54
55 Thanks also to the developer(s) of the Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
56
57 For a complete list of who did what, read the release notes!
52 58
53 Second Life Copyright © 1999-2009 Linden Research Inc. 59 Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
54
55 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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
56
57 Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime,
58 Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida,
59 Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao,
60 Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi,
61 Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky,
62 Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
63 60
64 3Dconnexion SDK Copyright © 1992-2007 3Dconnexion 61 3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
65 APR Copyright © 2000-2004 The Apache Software Foundation 62 APR Copyright © 2000-2004 The Apache Software Foundation
@@ -85,9 +82,12 @@
85 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) 82 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
86 83
87 84
88 Begin, be bold and venture to be wise. -- Horace 85 I live in the future, just waiting for the rest of you to catch up. -- onefang Rejected
86
87 When there are N ways of doing anything, LL implements N+1 ways. Their binary digits
88 have more than two values - "one", "zero", "perhaps", "maybe", "ummm", "er", and
89 "what was the question?"
89 90
90 If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou
91 </text_editor> 91 </text_editor>
92 </panel> 92 </panel>
93 </tab_container> 93 </tab_container>
@@ -95,3 +95,4 @@
95 You are at [POSITION] 95 You are at [POSITION]
96 </string> 96 </string>
97</floater> 97</floater>
98
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index ea64f82..fcaa869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1420,14 +1420,14 @@ Select the thumbnail to choose a different texture.
1420 </text> 1420 </text>
1421 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" 1421 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
1422 height="16" initial_value="false" 1422 height="16" initial_value="false"
1423 label="Residents who have not given payment info to Linden Lab" 1423 label="Residents who have not given payment info"
1424 left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" 1424 left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false"
1425 tool_tip="Ban unidentified residents." width="278" /> 1425 tool_tip="Ban unidentified residents." width="278" />
1426 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" 1426 <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
1427 height="16" initial_value="false" 1427 height="16" initial_value="false"
1428 label="Residents who are not age verified adults" left_delta="0" 1428 label="Residents who are not age verified adults" left_delta="0"
1429 mouse_opaque="true" name="limit_age_verified" radio_style="false" 1429 mouse_opaque="true" name="limit_age_verified" radio_style="false"
1430 tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information." 1430 tool_tip="Ban residents who have not verified their age."
1431 width="278" /> 1431 width="278" />
1432 <string name="estate_override"> 1432 <string name="estate_override">
1433 One or more of these options is set at the estate level 1433 One or more of these options is set at the estate level
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 4ccfe60..96f8f1e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,6 +37,42 @@
37 <string name="unavailable_text_label"> 37 <string name="unavailable_text_label">
38 Text chat is not available for this call. 38 Text chat is not available for this call.
39 </string> 39 </string>
40 <!--[$PLOTR$]-->
41 <string name="otr_empty_string"></string>
42 <string name="otr_gen_key_please_wait">OTR is generating keys. This will happen once for each of your avatars and should take less than 45 seconds.</string>
43 <string name="otr_generic_name">Your buddy</string>
44 <string name="otr_err_send_in_finished">[NAME] has ended the private conversation, so your message was not sent. You should restart the private conversation, or end the private conversation.</string>
45 <string name="otr_err_deacivated">OTR has been deactivated by preferences (edit > preferences > Emerald tab > IM tab)</string>
46 <string name="otr_err_failed_sending">Unable to encrypt your message for some reason; it has not been sent.</string>
47 <string name="otr_err_failed_starting">Unable to start private conversation.</string>
48 <string name="otr_err_offline_start">[NAME] appears offline; OTR will not try to start a private conversation.</string>
49 <string name="otr_err_offline_send">[NAME] appears offline; You may "End private conversation" and send your message un-encrypted.</string>
50 <string name="otr_prog_I_start">Attempting to start a private conversation with [NAME].</string>
51 <string name="otr_prog_I_stop_unverified">You have ended the unverified conversation with [NAME].</string>
52 <string name="otr_prog_I_stop_private" >You have ended the private conversation with [NAME].</string>
53 <string name="otr_prog_I_stop" >You have ended the OTR conversation with [NAME].</string>
54 <string name="otr_prog_they_start">[NAME] is attempting to start a private conversation.</string>
55 <string name="otr_prog_they_stop_unverified">[NAME] has ended the unverified conversation.</string>
56 <string name="otr_prog_they_stop_private" >[NAME] has ended the private conversation.</string>
57 <string name="otr_prog_they_stop" >[NAME] has ended the OTR conversation.</string>
58 <string name="otr_log_authenticated" >[NAME] is now authenticated.</string>
59 <string name="otr_log_start_private" >Private conversation with [NAME] started.</string>
60 <string name="otr_log_start_unverified">Unverified conversation started. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
61 <string name="otr_log_gone_insecure">Private conversation ended.</string>
62 <string name="otr_log_still_private" >Private conversation with [NAME] resumed.</string>
63 <string name="otr_log_still_unverified">Unverified conversation resumed. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
64 <string name="otr_not_private">OTR: Not Private</string>
65 <string name="otr_unverified" >OTR: Unverified</string>
66 <string name="otr_private" >OTR: Private</string>
67 <string name="otr_finished" >OTR: Finished</string>
68 <string name="otr_start" >Start private conversation</string>
69 <string name="otr_refresh">Refresh private conversation</string>
70 <string name="otr_restart">Restart private conversation</string>
71 <string name="otr_stop" >End private conversation</string>
72 <string name="otr_auth" >Authenticate buddy</string>
73 <string name="otr_help" >What is OTR?</string>
74 <string name="otr_levels" >What is this?</string>
75 <!--[/$PLOTR$]-->
40 <string name="add_friend_string"> 76 <string name="add_friend_string">
41 Add Friend 77 Add Friend
42 </string> 78 </string>
@@ -59,6 +95,21 @@
59 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 95 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
60 label="End Call" left_delta="0" name="end_call_btn" pad_right="10" 96 label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
61 visible="false" width="100" /> 97 visible="false" width="100" />
98
99 <flyout_button bottom_delta="0" follows="left|top" height="20" label="OTR: Status" left_delta="5" width="150"
100 list_position="below" mouse_opaque="true" name="otr_btn"
101 tool_tip="Click to change OTR status, or dropdown for other options." >
102 <flyout_button_item value="otr_auth_entry" name="otr_auth_entry">
103 Authenticate buddy
104 </flyout_button_item>
105 <flyout_button_item value="otr_help_entry" name="otr_help_entry">
106 What is OTR?
107 </flyout_button_item>
108 <flyout_button_item value="otr_levels_entry" name="otr_levels_entry">
109 What is this?
110 </flyout_button_item>
111 </flyout_button>
112
62 <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 113 <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right"
63 text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true" 114 text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
64 bg_visible="false" border_drop_shadow_visible="false" border_visible="false"> 115 bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_otr_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_otr_options.xml
new file mode 100644
index 0000000..9f0d798
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_otr_options.xml
@@ -0,0 +1,44 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="busy" title="OTR Options"
3 height="175" width="180" min_height="175" min_width="180"
4 follows="top|right" can_close="true" can_drag_on_left="false"
5 can_minimize="true" can_resize="false" can_tear_off="false">
6
7 <button bottom="-40" follows="left|top" font="SansSerifSmall"
8 height="18" right="-10"
9 name="otr_help_btn" width="98" label="What is OTR?"/>
10 <radio_group bottom="-120" draw_border="false" enabled="true" follows="left|top"
11 height="80"
12 left="10" mouse_opaque="true" name="EmeraldUseOTR" width="160">
13 <radio_item type="string" length="1" bottom_delta="-10" enabled="true" height="16"
14 left_delta="0" mouse_opaque="true" name="0" width="98"
15 tool_tip="Require use of OTR in IMs"
16 >Require use of OTR in IMs</radio_item>
17 <radio_item type="string" length="1" bottom_delta="-10" enabled="true" height="16"
18 left_delta="0" mouse_opaque="true" name="1" width="98"
19 tool_tip="Request OTR if available."
20 >Request OTR if available</radio_item>
21 <radio_item type="string" length="1" bottom_delta="-10" enabled="true" height="16"
22 left_delta="0" mouse_opaque="true" name="2" width="98"
23 tool_tip="Accept OTR requests."
24 >Accept OTR requests</radio_item>
25 <radio_item type="string" length="1" bottom_delta="-10" enabled="true" height="16"
26 left_delta="0" mouse_opaque="true" name="3" width="98"
27 tool_tip="Decline use of OTR."
28 >Decline use of OTR</radio_item>
29 </radio_group>
30 <check_box follows="left|top" left="10" bottom_delta="-20" enabled="true"
31 font="SansSerifSmall"
32 height="16" initial_value="false" mouse_opaque="true"
33 name="EmeraldOTRInTypingStop-toggle"
34 radio_style="false" width="98"
35 control_name="EmeraldOTRInTypingStop"
36 tool_tip="Put all OTR encrypted messages into IM_TYPING_STOP packets to prevent encrypted IM's from going to email."
37 label="Use typing_stop for OTR"/>
38
39 <button bottom_delta="-26" follows="top|right" height="22" label="Cancel"
40 right="-10" name="btn_cancel" tool_tip="" enagled="true" width="80" />
41 <button bottom_delta="0" follows="top|right" height="22" label="OK"
42 right="-95" name="btn_ok" tool_tip="" enabled="true" width="80" />
43
44</floater> \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 83d7a5c..67b72e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -106,8 +106,8 @@
106 <combo_item name="MissingContent" value="21"> 106 <combo_item name="MissingContent" value="21">
107 Missing Content 107 Missing Content
108 </combo_item> 108 </combo_item>
109 <combo_item name="LindenDollars(L$)" value="14"> 109 <combo_item name="GridCurrency" value="14">
110 Linden Dollars (L$) 110 Grid currency
111 </combo_item> 111 </combo_item>
112 <combo_item name="Permissions" value="15"> 112 <combo_item name="Permissions" value="15">
113 Permissions 113 Permissions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index daf217e..314ad20 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -154,7 +154,7 @@
154 mouse_opaque="true" name="spin y" 154 mouse_opaque="true" name="spin y"
155 tool_tip="Y coordinate of location to show on map" width="48" /> 155 tool_tip="Y coordinate of location to show on map" width="48" />
156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16" 156 <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
157 increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0" 157 increment="1" initial_val="0" left_delta="50" max_val="16383" min_val="0"
158 mouse_opaque="true" name="spin z" 158 mouse_opaque="true" name="spin z"
159 tool_tip="Z coordinate of location to show on map" width="48" /> 159 tool_tip="Z coordinate of location to show on map" width="48" />
160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center" 160 <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 4582f4e..ffdafe2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -34,7 +34,7 @@
34 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" /> 34 userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
35 </menu_item_call> 35 </menu_item_call>
36 <menu_item_separator /> 36 <menu_item_separator />
37 <menu_item_call label="About Imprudence" name="About Imprudence"> 37 <menu_item_call label="About meta-impy" name="About meta-impy">
38 <on_click function="ShowFloater" userdata="about" /> 38 <on_click function="ShowFloater" userdata="about" />
39 </menu_item_call> 39 </menu_item_call>
40 </menu> 40 </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index efde449..193592b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -873,8 +873,8 @@
873 <on_click function="ShowFloater" userdata="lag meter" /> 873 <on_click function="ShowFloater" userdata="lag meter" />
874 </menu_item_call> 874 </menu_item_call>
875 <menu_item_separator /> 875 <menu_item_separator />
876 <menu_item_call name="About Imprudence" 876 <menu_item_call name="About meta-impy"
877 label="About Imprudence"> 877 label="About meta-impy">
878 <on_click function="ShowFloater" userdata="about" /> 878 <on_click function="ShowFloater" userdata="about" />
879 </menu_item_call> 879 </menu_item_call>
880 </menu> 880 </menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 033b01b..5f97d74 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,7 +1,7 @@
1<?xml version="1.0" ?><notifications> 1<?xml version="1.0" ?><notifications>
2 2
3<global name="VIEWER_NAME">Imprudence</global> 3<global name="VIEWER_NAME">meta-impy</global>
4<global name="VIEWER_SITE">kokuaviewer.org</global> 4<global name="VIEWER_SITE">www.meta7.com</global>
5<global name="SECOND_LIFE">Second Life</global> 5<global name="SECOND_LIFE">Second Life</global>
6<global name="SECOND_LIFE_SITE">secondlife.com</global> 6<global name="SECOND_LIFE_SITE">secondlife.com</global>
7 7
@@ -1435,7 +1435,7 @@ Corrupt resource file:
1435 icon="alertmodal.tga" 1435 icon="alertmodal.tga"
1436 name="UnknownResourceFileVersion" 1436 name="UnknownResourceFileVersion"
1437 type="alertmodal"> 1437 type="alertmodal">
1438Unknown Linden resource file version in file: 1438Unknown resource file version in file:
1439 1439
1440[FILE] 1440[FILE]
1441</notification> 1441</notification>
@@ -2870,7 +2870,7 @@ Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
2870 icon="alertmodal.tga" 2870 icon="alertmodal.tga"
2871 name="WebLaunchSupportWiki" 2871 name="WebLaunchSupportWiki"
2872 type="alertmodal"> 2872 type="alertmodal">
2873Go to the Official Linden Blog, for the latest news and information. 2873Go to the grids web site, for the latest news and information.
2874 <usetemplate 2874 <usetemplate
2875 ignoretext="When launching web browser to view the blog" 2875 ignoretext="When launching web browser to view the blog"
2876 name="okcancelignore" 2876 name="okcancelignore"
@@ -3187,30 +3187,11 @@ Type a short announcement which will be sent to everyone currently in your estat
3187 3187
3188<notification 3188<notification
3189 icon="alert.tga" 3189 icon="alert.tga"
3190 label="Change Linden Estate" 3190 label="Pfft some old linden crap"
3191 name="ChangeLindenEstate" 3191 name="PfftLindenCrap"
3192 type="alert"> 3192 type="alert">
3193You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.). 3193This used to be some Linden inspired crap, but should never be seen now.
3194 3194Still unravelling the code before I make this go away.
3195This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience. On the mainland, it will change thousands of regions and make the spaceserver hiccup.
3196
3197Proceed?
3198 <usetemplate
3199 name="okcancelbuttons"
3200 notext="Cancel"
3201 yestext="OK"/>
3202</notification>
3203
3204<notification
3205 icon="alert.tga"
3206 label="Change Linden Estate Access"
3207 name="ChangeLindenAccess"
3208 type="alert">
3209You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
3210
3211This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
3212
3213It will change thousands of regions and make the spaceserver hiccup.
3214 <usetemplate 3195 <usetemplate
3215 name="okcancelbuttons" 3196 name="okcancelbuttons"
3216 notext="Cancel" 3197 notext="Cancel"
@@ -3679,7 +3660,7 @@ Default: off
3679 label="Max Inventory Items To Transfer" 3660 label="Max Inventory Items To Transfer"
3680 name="HelpMaxInventoryItemsTransfer" 3661 name="HelpMaxInventoryItemsTransfer"
3681 type="alertmodal"> 3662 type="alertmodal">
3682This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42. 3663This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default setting is 42.
3683 3664
3684Default: -1 3665Default: -1
3685</notification> 3666</notification>
@@ -4042,7 +4023,7 @@ Estate managers can only be added or removed by the owner of the estate, not by
4042 label="Use Global Time" 4023 label="Use Global Time"
4043 name="HelpEstateUseGlobalTime" 4024 name="HelpEstateUseGlobalTime"
4044 type="alertmodal"> 4025 type="alertmodal">
4045This checkbox makes the sun in your estate follow the same position as on the Linden-owned &apos;mainland&apos; estates. 4026This checkbox makes the sun in your estate follow the same position as on the grid owned estates.
4046 4027
4047Default: on 4028Default: on
4048</notification> 4029</notification>
@@ -4098,7 +4079,7 @@ Access to this estate will be limited to groups listed here and any Residents ab
4098 type="alertmodal"> 4079 type="alertmodal">
4099Setting this to a valid email address will cause abuse reports on this estate to be sent to that address. 4080Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
4100 4081
4101Setting it blank will cause abuse reports to be sent only to Linden Lab. 4082Setting it blank will cause abuse reports to be sent only to the grid owners.
4102</notification> 4083</notification>
4103 4084
4104<notification 4085<notification
@@ -4430,14 +4411,14 @@ http://secondlife.com/support/incidentreport.php
4430 icon="alertmodal.tga" 4411 icon="alertmodal.tga"
4431 name="HelpReportAbuseEmailEO" 4412 name="HelpReportAbuseEmailEO"
4432 type="alertmodal"> 4413 type="alertmodal">
4433IMPORTANT: This report will go to the owner of the region you are currently in and not to Linden Lab. 4414IMPORTANT: This report will go to the owner of the region you are currently in and not to the grid owners.
4434 4415
4435As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. Linden Lab will not investigate reports you file from this location. 4416As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. The grid owners will not investigate reports you file from this location.
4436 4417
4437The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant. 4418The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
4438(View covenants by going to the World menu and selecting About Land.) 4419(View covenants by going to the World menu and selecting About Land.)
4439 4420
4440The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only Linden Lab can restrict access to the entirety of [GRID_NAME]. --> 4421The resolution of this report applies only to this Region; Residents access to other areas of [GRID_NAME] will not be affected by the outcome of this report. <!-- Only the grid owners can restrict access to the entirety of [GRID_NAME]. -->
4441</notification> 4422</notification>
4442 4423
4443<notification 4424<notification
@@ -4531,15 +4512,13 @@ Dear Resident,
4531 4512
4532You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly: 4513You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
4533 4514
4534(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world. 4515(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behaviour that violates this grids Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from this grid.
4535 4516
4536(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. 4517(2) The DMCA or Content Removal Process. To request removal of content from this grid, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
4537 4518
4538If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;. 4519If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;.
4539 4520
4540Thank you, 4521Thank you.
4541
4542Linden Lab
4543</notification> 4522</notification>
4544 4523
4545<notification 4524<notification
@@ -5732,9 +5711,9 @@ If you want to view streaming media on parcels that support it you should go to
5732No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. 5711No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable.
5733</notification> 5712</notification>
5734<notification 5713<notification
5735 icon="alertmodal.tga" 5714 icon="alert.tga"
5736 name="MediaPluginFailed" 5715 name="MediaPluginFailed"
5737 type="alertmodal"> 5716 type="alert">
5738The following Media Plugin has failed: 5717The following Media Plugin has failed:
5739[PLUGIN] 5718[PLUGIN]
5740 5719
@@ -6905,6 +6884,27 @@ This ensures that you have the latest information available regarding other clie
6905The URL you clicked cannot be opened from this web browser. 6884The URL you clicked cannot be opened from this web browser.
6906</notification> 6885</notification>
6907 6886
6887<!--[$PLOTR$]-->
6888<notification
6889 icon="notify.tga"
6890 name="QueryEmeraldOTR"
6891 type="alertmodal">
6892OTR encrypts your IMs so they can't be read by anyone other than the person you are talking to.
6893
6894Do you want to automatically secure your IMs?
6895 <form name="form">
6896 <button index="0" name="Yes" text="Yes"/>
6897 <button index="1" name="No" text="No"/>
6898 </form>
6899</notification>
6900<!-- These belong in some help page, but there is no similar page in Imprudence (yet?)
6901
6902OTR - This is automatic encryption of your IM's to prevent sniffers from spying.
6903Strongly recommended to use Require OTR setting.
6904Typing stop packets - sends encrypted messages differently so they do not wind up in offline emails.
6905
6906-->
6907<!--[/$PLOTR$]-->
6908<!--Begin Imprudence notifications--> 6908<!--Begin Imprudence notifications-->
6909 6909
6910<notification 6910<notification
@@ -7323,6 +7323,8 @@ Various options for command line features.
7323To use a command, type it in your chat bar (Local Chat) and press enter. 7323To use a command, type it in your chat bar (Local Chat) and press enter.
7324</notification> 7324</notification>
7325 7325
7326
7327
7326<notification 7328<notification
7327 icon="alertmodal.tga" 7329 icon="alertmodal.tga"
7328 label="Spell Check Help" 7330 label="Spell Check Help"
diff --git a/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_dialog.xml
new file mode 100644
index 0000000..73d2caa
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_dialog.xml
@@ -0,0 +1,131 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!--[$PLOTR$]-->
2<!--otr_floater_smp_dialog.xml - ui defs for the OTR SMP dialog box
3 $PLOTR$ See http://www.cypherpunks.ca/otr/
4
5 Copyright (C) 2009 Chris Tuchs
6
7 This is free software; you can redistribute it and/or modify it
8 under the terms of the GNU Lesser General Public License as
9 published by the Free Software Foundation; either version 2.1 of
10 the License, or (at your option) any later version.
11
12 This is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
15 License for more details.
16
17 You should have received a copy of the GNU Lesser General Public
18 License along with the viewer; if not, write to the Free Software
19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
20 02111-1307, USA. -->
21<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
22 height="445" min_height="445" width="400" min_width="400" name="otr_floater_smp_dialog"
23 rect_control="OtrFloaterSmpDialogRect" title="Authenticating Buddy">
24 <string name="otr_empty_string"></string>
25 <string name="otr_smp_I_auth_name" >Authenticating [NAME]</string>
26 <string name="otr_smp_name_auth_me">[NAME] is authenticating you</string>
27 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
28 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="left"
29 follows="left|top"
30 height="50" width="370"
31 left="15" bottom_delta="-80"
32 mouse_opaque="true" name="otr_smp_why"/>
33 <string name="otr_smp_why_text">
34Authenticating a buddy helps ensure that the person you are talking to is who he or she claims to be. It also helps ensure that noone else is listening to the private conversation.
35 </string>
36 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
37 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="center"
38 follows="left|top"
39 height="20" width="370"
40 left="15" bottom_delta="-25"
41 mouse_opaque="true" name="otr_smp_how_text"/>
42 <string name="otr_smp_how_I_challenge_name" >How would you like to authenticate [NAME]?</string>
43 <string name="otr_smp_how_name_challenge_me">[NAME] is authenticating you by a</string>
44 <string name="otr_smp_how_by_qa_challenge" >Question and answer challenge</string>
45 <string name="otr_smp_how_by_ss_challenge" >Shared secret challenge</string>
46 <string name="otr_smp_how_by_qa" >Question and answer</string>
47 <string name="otr_smp_how_by_ss" >Shared secret</string>
48 <string name="otr_smp_how_by_mfv" >Manual fingerprint verification</string>
49 <combo_box follows="left|top"
50 height="20" width="200"
51 left="100" bottom_delta="-20"
52 label="Not set yet" halign="left"
53 name="otr_smp_how_combo"/>
54 <string name="otr_smp_howto_qa">
55To authenticate using a question, pick a question whose answer is known only to you and your buddy. Enter the question and correct answer, push "Authenticate", then wait for your buddy to enter the answer too. If the answers don't match, then either your buddy made a mistake typing in the answer, or you may be talking to an imposter.
56 </string>
57 <string name="otr_smp_howto_qa_t1">
58Enter question here:
59 </string>
60 <string name="otr_smp_howto_qa_t2">
61Enter secret answer here (case sensitive):
62 </string>
63 <string name="otr_smp_howto_ss">
64To authenticate someone with the shared secret method, you and your buddy should decide on a secret word or phrase in advance. This can be done however you like, but you shouldn't type the phrase directly into your conversation. Enter this secret, push "Authenticate", then wait for your buddy to enter the answer too. If the secrets don't match, then either your buddy made a mistake typing in the secret, or you may be talking to an imposter.
65 </string>
66 <string name="otr_smp_howto_ss_t1">
67Enter secret here (case sensitive):
68 </string>
69 <string name="otr_smp_howto_ss_t2"></string>
70 <string name="otr_smp_howto_mfv">
71To authenticate using fingerprints, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the pull-down below that you have verified the fingerprint.
72 </string>
73 <string name="otr_smp_howto_mfv_t1">Your fingerprint, tell them this:</string>
74 <string name="otr_smp_howto_mfv_t2">Their fingerprint, be sure that they tell you this:</string>
75 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
76 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="left"
77 follows="left|top"
78 height="100" width="370"
79 left="15" bottom_delta="-110"
80 mouse_opaque="true" name="otr_smp_howto">
81howto explanation
82 </text>
83 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
84 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="left"
85 follows="left|top"
86 height="20" width="370"
87 left="15" bottom_delta="-50"
88 mouse_opaque="true" name="otr_smp_label1">
89text label 1
90 </text>
91 <line_editor bevel_style="in" border_style="line" border_thickness="1"
92 mouse_opaque="true" font="SansSerif"
93 select_all_on_focus_received="false" select_on_focus="false"
94 follows="top|right"
95 height="20" width="370"
96 left="15" bottom_delta="-20"
97 label="" max_length="256"
98 name="otr_smp_edit1"/>
99 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
100 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="left"
101 follows="left|top"
102 height="20" width="370"
103 left="15" bottom_delta="-30"
104 mouse_opaque="true" name="otr_smp_label2">
105text label 2
106 </text>
107 <line_editor bevel_style="in" border_style="line" border_thickness="1"
108 mouse_opaque="true" font="SansSerif"
109 select_all_on_focus_received="false" select_on_focus="false"
110 follows="top|right"
111 height="20" width="370"
112 left="15" bottom_delta="-20"
113 label="" max_length="256"
114 name="otr_smp_edit2"/>
115 <string name="otr_smp_veri_no">I have NOT verified their fingerprint.</string>
116 <string name="otr_smp_veri_yes">I HAVE verified their fingerprint.</string>
117 <combo_box follows="left|top"
118 height="20" width="210"
119 left="175" bottom_delta="-40"
120 label="" halign="left"
121 name="otr_smp_veri_combo"/>
122 <button bottom="-435" follows="left|bottom" font="SansSerif" halign="center"
123 height="20" label="Help" label_selected="Help" left="20"
124 mouse_opaque="true" name="otr_smp_help_btn" width="60" />
125 <button bottom="-435" follows="right|bottom" font="SansSerif" halign="center"
126 height="20" label="Authenticate" label_selected="Authenticate" left="292"
127 mouse_opaque="true" name="otr_smp_auth_btn" width="88" />
128 <button bottom="-435" follows="right|bottom" font="SansSerif" halign="center"
129 height="20" label="Cancel" label_selected="Cancel" left_delta="-65"
130 mouse_opaque="true" name="otr_smp_cancel_btn" width="60" />
131</floater> <!--[/$PLOTR$]-->
diff --git a/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_progress.xml b/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_progress.xml
new file mode 100644
index 0000000..dde8f4c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/otr_floater_smp_progress.xml
@@ -0,0 +1,52 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!--[$PLOTR$]-->
2<!--otr_floater_smp_progress.xml - ui defs for the OTR SMP progress dialog box
3 $PLOTR$ See http://www.cypherpunks.ca/otr/
4
5 Copyright (C) 2009 Chris Tuchs
6
7 This is free software; you can redistribute it and/or modify it
8 under the terms of the GNU Lesser General Public License as
9 published by the Free Software Foundation; either version 2.1 of
10 the License, or (at your option) any later version.
11
12 This is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
15 License for more details.
16
17 You should have received a copy of the GNU Lesser General Public
18 License along with the viewer; if not, write to the Free Software
19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
20 02111-1307, USA. -->
21<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
22 height="200" min_height="200" width="400" min_width="400" name="otr_floater_smp_prog"
23 rect_control="OtrFloaterSmpProgRect" title="Authenticating Buddy">
24 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
25 drop_shadow_visible="true" font="SansSerif" h_pad="0" v_pad="0" halign="center"
26 follows="left|top"
27 height="40" width="370"
28 left="15" bottom="-85"
29 mouse_opaque="true" name="otr_smp_prog_status">Authenticating buddy...</text>
30 <string name="otr_smp_prog_I_auth_them" >Authenticating your buddy...</string>
31 <string name="otr_smp_prog_they_auth_me" >Your buddy is authenticating you...</string>
32 <string name="otr_smp_prog_I_auth_name" >Authenticating [NAME]...</string>
33 <string name="otr_smp_prog_name_auth_me" >[NAME] is authenticating you...</string>
34 <string name="otr_smp_prog_auth_aborted" >Authentication aborted</string>
35 <string name="otr_smp_prog_auth_failed" >Authentication failed</string>
36 <string name="otr_smp_prog_auth_errored" >Authentication error</string>
37 <string name="otr_smp_prog_auth_ok" >Authenticated!</string>
38 <string name="otr_smp_prog_auth_ok_name_next">You are authenticated! Now you may want to authenticate [NAME].</string>
39 <progress_bar name="otr_smp_prog_progress_bar" color="255,255,255,245"
40 height="20"
41 bottom="-110" left="45" right="-45"
42 follows="left|right|top" />
43 <button bottom="-185" follows="left|bottom" font="SansSerif" halign="center"
44 height="20" label="Help" label_selected="Help" left="20"
45 mouse_opaque="true" name="otr_smp_prog_help_btn" width="60" />
46 <button bottom="-185" follows="right|bottom" font="SansSerif" halign="center"
47 height="20" label="OK" label_selected="OK" left="320"
48 mouse_opaque="true" name="otr_smp_prog_ok_btn" width="60" />
49 <button bottom="-185" follows="right|bottom" font="SansSerif" halign="center"
50 height="20" label="Cancel" label_selected="Cancel" left_delta="-65"
51 mouse_opaque="true" name="otr_smp_prog_cancel_btn" width="60" />
52</floater> <!--[/$PLOTR$]-->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 6076eb9..389e069 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -10,7 +10,7 @@
10[AGEVERIFICATION] 10[AGEVERIFICATION]
11 </string> 11 </string>
12 <string name="AcctTypeResident"> 12 <string name="AcctTypeResident">
13 Resident 13 Citizen
14 </string> 14 </string>
15 <string name="AcctTypeTrial"> 15 <string name="AcctTypeTrial">
16 Trial 16 Trial
@@ -19,7 +19,7 @@
19 Charter Member 19 Charter Member
20 </string> 20 </string>
21 <string name="AcctTypeEmployee"> 21 <string name="AcctTypeEmployee">
22 Linden Lab Employee 22 Grid staff
23 </string> 23 </string>
24 <string name="PaymentInfoUsed"> 24 <string name="PaymentInfoUsed">
25 Payment Info Used 25 Payment Info Used
@@ -31,10 +31,10 @@
31 No Payment Info On File 31 No Payment Info On File
32 </string> 32 </string>
33 <string name="AgeVerified"> 33 <string name="AgeVerified">
34 Age-verified 34 Age verified
35 </string> 35 </string>
36 <string name="NotAgeVerified"> 36 <string name="NotAgeVerified">
37 Not Age-verified 37 Not age verified
38 </string> 38 </string>
39 <string name="copy_key_info"> 39 <string name="copy_key_info">
40 Copied key for [AVATAR] to clipboard: [KEY] 40 Copied key for [AVATAR] to clipboard: [KEY]
@@ -106,7 +106,7 @@
106 bottom_delta="-25" drop_shadow_visible="true" follows="left|top" 106 bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
107 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12" 107 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
108 mouse_opaque="true" name="partner_label" 108 mouse_opaque="true" name="partner_label"
109 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 109 tool_tip="In world partner."
110 v_pad="0" width="145"> 110 v_pad="0" width="145">
111 Partner: 111 Partner:
112 </text> 112 </text>
@@ -121,7 +121,7 @@
121 border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top" 121 border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
122 font="SansSerifSmall" height="18" is_unicode="false" right="-12" 122 font="SansSerifSmall" height="18" is_unicode="false" right="-12"
123 max_length="254" mouse_opaque="false" name="partner_edit" 123 max_length="254" mouse_opaque="false" name="partner_edit"
124 tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner" 124 tool_tip="In world partner."
125 width="145"> 125 width="145">
126 [FIRST] [LAST] 126 [FIRST] [LAST]
127 </line_editor> 127 </line_editor>
@@ -303,7 +303,7 @@
303 bottom="-20" drop_shadow_visible="true" follows="left|top" 303 bottom="-20" drop_shadow_visible="true" follows="left|top"
304 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 304 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
305 mouse_opaque="true" 305 mouse_opaque="true"
306 name="Tell everyone about your favorite places in Second Life." v_pad="0" 306 name="Tell everyone about your favorite places in world." v_pad="0"
307 width="302"> 307 width="302">
308 Tell everyone about your favorite places. 308 Tell everyone about your favorite places.
309 </text> 309 </text>
@@ -329,7 +329,7 @@
329 bottom="-20" drop_shadow_visible="true" follows="left|top" 329 bottom="-20" drop_shadow_visible="true" follows="left|top"
330 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114" 330 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
331 mouse_opaque="true" 331 mouse_opaque="true"
332 name="Place an ad in Second Life&apos;s classified listings." v_pad="0" 332 name="Place an ad in the classified listings." v_pad="0"
333 width="302"> 333 width="302">
334 Place an ad in the current grid&apos;s classified listings. 334 Place an ad in the current grid&apos;s classified listings.
335 </text> 335 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 2974490..9a06d0f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -150,8 +150,6 @@ Hover your mouse over the options for more help.
150 Retrieving member data 150 Retrieving member data
151 </string> 151 </string>
152 <string name="confirm_group_create_str"> 152 <string name="confirm_group_create_str">
153 Creating this group will cost [GROUPCREATEFEE]. 153Are you sure you want to spend [GROUPCREATEFEE] to create this group?
154Are you really, really, REALLY sure you want to spend [GROUPCREATEFEE] to create this group?
155Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group&apos;s name will be unavailable for future use.
156 </string> 154 </string>
157</panel> 155</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 05e6b31..bfb6866 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -5,7 +5,7 @@
5 follows="left|top|right|bottom" mouse_opaque="true" > 5 follows="left|top|right|bottom" mouse_opaque="true" >
6 6
7 <web_browser name="login_html" 7 <web_browser name="login_html"
8 bottom="102" top="-1" left="0" right="-1" 8 bottom="0" top="-1" left="0" right="-1"
9 border_visible="false" follows="top|left|bottom|right" 9 border_visible="false" follows="top|left|bottom|right"
10 start_url="data:text/html, 10 start_url="data:text/html,
11 %3Chtml%3E 11 %3Chtml%3E
@@ -14,7 +14,7 @@
14 %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E 14 %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E
15 %3Ctr%3E 15 %3Ctr%3E
16 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E 16 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E
17 %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E 17 %3Cimg src=%22meta-impy_loading.png%22 align=%22absmiddle%22%3E
18 %3Cbr/%3E 18 %3Cbr/%3E
19 %3CH1%3Eloading...%3C/H1%3E 19 %3CH1%3Eloading...%3C/H1%3E
20 %3C/td%3E 20 %3C/td%3E
@@ -29,35 +29,24 @@
29 http://secondlife.com/account/request.php 29 http://secondlife.com/account/request.php
30 </string> 30 </string>
31 31
32
33 <!-- GRIDS -->
34
35 <text name="grid_text"
36 bottom="80" left="15" height="16" width="120"
37 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
38 bg_visible="false" drop_shadow_visible="true"
39 border_visible="false" border_drop_shadow_visible="false"
40 font="SansSerif" mouse_opaque="true">
41 Grid:
42 </text>
43 <combo_box name="server_combo"
44 bottom_delta="-20" left_delta="0" height="20" width="120"
45 follows="left|bottom" allow_text_entry="false"
46 max_chars="20" mouse_opaque="true" />
47
48
49 <!-- FIRST NAME --> 32 <!-- FIRST NAME -->
50 33
51 <text name="first_name_text" 34 <text name="first_name_text"
52 bottom="80" left="165" height="16" width="120" 35 bottom="48" left="24" height="16" width="120"
53 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 36 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
54 bg_visible="false" drop_shadow_visible="true" 37 bg_visible="false" drop_shadow_visible="true"
55 border_visible="false" border_drop_shadow_visible="false" 38 border_visible="false" border_drop_shadow_visible="false"
56 font="SansSerif" mouse_opaque="true"> 39 font="SansSerif" mouse_opaque="true">
57 First name: 40 First name:
58 </text> 41 </text>
42<!--
43 <combo_box bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
44 follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" height="20" left_delta="0"
45 max_chars="31" mouse_opaque="true" name="first_name_combo"
46 select_all_on_focus_received="true" width="120" allow_text_entry="true" allow_translate="false" />
47-->
59 <line_editor name="first_name_edit" 48 <line_editor name="first_name_edit"
60 bottom_delta="-20" left_delta="0" height="20" width="120" 49 bottom_delta="-24" left_delta="0" height="20" width="120"
61 follows="left|bottom" font="SansSerif" 50 follows="left|bottom" font="SansSerif"
62 bevel_style="in" border_style="line" border_thickness="1" 51 bevel_style="in" border_style="line" border_thickness="1"
63 max_length="31" mouse_opaque="true" 52 max_length="31" mouse_opaque="true"
@@ -65,11 +54,10 @@
65 select_all_on_focus_received="true" 54 select_all_on_focus_received="true"
66 allow_translate="false" /> 55 allow_translate="false" />
67 56
68
69 <!-- LAST NAME --> 57 <!-- LAST NAME -->
70 58
71 <text name="last_name_text" 59 <text name="last_name_text"
72 bottom_delta="20" left_delta="130" height="16" width="120" 60 bottom_delta="24" left_delta="130" height="16" width="120"
73 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 61 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
74 bg_visible="false" drop_shadow_visible="true" 62 bg_visible="false" drop_shadow_visible="true"
75 border_visible="false" border_drop_shadow_visible="false" 63 border_visible="false" border_drop_shadow_visible="false"
@@ -77,7 +65,7 @@
77 Last name: 65 Last name:
78 </text> 66 </text>
79 <line_editor name="last_name_edit" 67 <line_editor name="last_name_edit"
80 bottom_delta="-20" left_delta="0" height="20" width="120" 68 bottom_delta="-24" left_delta="0" height="20" width="120"
81 follows="left|bottom" font="SansSerif" 69 follows="left|bottom" font="SansSerif"
82 bevel_style="in" border_style="line" border_thickness="1" 70 bevel_style="in" border_style="line" border_thickness="1"
83 max_length="31" mouse_opaque="true" 71 max_length="31" mouse_opaque="true"
@@ -86,30 +74,10 @@
86 allow_translate="false" /> 74 allow_translate="false" />
87 75
88 76
89 <!-- SL USERNAME -->
90
91 <text name="username_text"
92 bottom="80" left="165" height="16" width="250"
93 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
94 bg_visible="false" drop_shadow_visible="true"
95 border_visible="false" border_drop_shadow_visible="false"
96 font="SansSerif" mouse_opaque="true">
97 Login name:
98 </text>
99 <line_editor name="username_edit"
100 bottom_delta="-20" left_delta="0" height="20" width="250"
101 follows="left|bottom" font="SansSerif"
102 bevel_style="in" border_style="line" border_thickness="1"
103 max_length="63" mouse_opaque="true"
104 handle_edit_keys_directly="true"
105 select_all_on_focus_received="true"
106 allow_translate="false" />
107
108
109 <!-- PASSWORD --> 77 <!-- PASSWORD -->
110 78
111 <text name="password_text" 79 <text name="password_text"
112 bottom_delta="20" left="425" height="16" width="120" 80 bottom_delta="24" left_delta="130" height="16" width="120"
113 follows="left|bottom" h_pad="0" halign="left" v_pad="0" 81 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
114 bg_visible="false" drop_shadow_visible="true" 82 bg_visible="false" drop_shadow_visible="true"
115 border_visible="false" border_drop_shadow_visible="false" 83 border_visible="false" border_drop_shadow_visible="false"
@@ -117,7 +85,7 @@
117 Password: 85 Password:
118 </text> 86 </text>
119 <line_editor name="password_edit" 87 <line_editor name="password_edit"
120 bottom_delta="-20" left_delta="0" height="20" width="120" 88 bottom_delta="-24" left_delta="0" height="20" width="120"
121 follows="left|bottom" font="SansSerif" 89 follows="left|bottom" font="SansSerif"
122 bevel_style="in" border_style="line" border_thickness="1" 90 bevel_style="in" border_style="line" border_thickness="1"
123 max_length="16" mouse_opaque="true" 91 max_length="16" mouse_opaque="true"
@@ -126,60 +94,97 @@
126 allow_translate="false" /> 94 allow_translate="false" />
127 95
128 96
129 <!-- GRID MANAGER --> 97 <!-- ACCOUNT CHECK BOXES -->
130 98
131 <button name="grid_btn" label="Grid Manager" 99 <check_box control_name="RememberName"
132 bottom="32" left="25" height="20" width="100" 100 follows="left|bottom" font="SansSerifSmall" height="16"
133 follows="left|bottom" font="SansSerifSmall" halign="center" 101 initial_value="true" label="Remember account name"
134 mouse_opaque="true" scale_image="TRUE" /> 102 bottom_delta="-24" left="24" mouse_opaque="true" name="remember_name_check" width="158" />
103 <check_box name="remember_check" label="Remember password"
104 bottom_delta="0" left_delta="260" height="16" width="140"
105 follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword"
106 initial_value="false" mouse_opaque="true" />
135 107
136 108
137 <!-- START LOCATION --> 109 <!-- START LOCATION -->
138 110
139 <text name="start_location_text" 111 <text name="start_location_text"
140 bottom_delta="0" left="125" height="16" width="115" 112 bottom="48" left_delta="150" height="16"
141 follows="left|bottom" h_pad="0" halign="right" v_pad="0" 113 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
142 bg_visible="false" drop_shadow_visible="true" 114 bg_visible="false" drop_shadow_visible="true"
143 border_visible="false" border_drop_shadow_visible="false" 115 border_visible="false" border_drop_shadow_visible="false"
144 font="SansSerifSmall" mouse_opaque="true"> 116 font="SansSerifSmall" mouse_opaque="true">
145 Start location: 117 Start location:
146 </text> 118 </text>
147 <combo_box name="start_location_combo" 119 <combo_box name="start_location_combo"
148 bottom_delta="2" left_delta="125" height="16" width="150" 120 bottom_delta="-24" left_delta="0" height="20" width="150"
149 follows="left|bottom" font="SansSerifSmall" 121 follows="left|bottom" font="SansSerifSmall"
150 mouse_opaque="true" allow_text_entry="true" max_chars="128"> 122 mouse_opaque="true" allow_text_entry="true" max_chars="128">
151 <combo_item name="MyHome" value="My Home"> 123 <combo_item name="MyHome" value="My Home">
152 My Home 124 My Home
153 </combo_item> 125 </combo_item>
154 <combo_item name="MyLastLocation" value="My Last Location"> 126 <combo_item name="MyLastLocation" value="My Last Location">
155 My Last Location 127 My Last Location
156 </combo_item> 128 </combo_item>
157 <combo_item name="Typeregionname" value="&lt;Type region name&gt;"> 129 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
158 &lt;Type region name&gt; 130 &lt;Type region name&gt;
159 </combo_item> 131 </combo_item>
160 </combo_box> 132 </combo_box>
161 133
162 134
163 <!-- REMEMBER PASSWORD --> 135 <!-- GRIDS -->
164 136
165 <check_box name="remember_check" label="Remember password" 137 <text name="grid_text"
166 bottom_delta="-2" left="425" height="16" width="140" 138 bottom="48" left_delta="160" height="16" width="120"
167 follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 139 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
168 initial_value="false" mouse_opaque="true" /> 140 bg_visible="false" drop_shadow_visible="true"
141 border_visible="false" border_drop_shadow_visible="false"
142 font="SansSerif" mouse_opaque="true">
143 Grid:
144 </text>
145 <combo_box name="server_combo"
146 bottom_delta="-24" left_delta="0" height="20" width="120"
147 follows="left|bottom" allow_text_entry="false"
148 max_chars="20" mouse_opaque="true" />
149 <button name="grid_btn" label="Grid Manager"
150 bottom_delta="-24" left_delta="0" height="20" width="100"
151 follows="left|bottom" font="SansSerifSmall" halign="center"
152 mouse_opaque="true" scale_image="TRUE" />
169 153
170 154
171 <!-- LOG IN --> 155 <!-- LOG IN -->
172 156
173 <button name="connect_btn" label="Log In" 157 <button name="connect_btn" label="Log In"
174 bottom="58" left="575" height="24" width="120" 158 bottom="24" left_delta="140" height="24" width="120"
175 follows="left|bottom" font="SansSerif" halign="center" 159 follows="left|bottom" font="SansSerif" halign="center"
176 mouse_opaque="true" scale_image="TRUE" /> 160 mouse_opaque="true" scale_image="TRUE" />
177 161
178 162
163 <!-- Yes, this is getting messy, with three different ways of doing the username. sigh -->
164 <!-- SL USERNAME -->
165
166 <text name="username_text"
167 bottom="80" left="24" height="16" width="250"
168 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
169 bg_visible="false" drop_shadow_visible="true"
170 border_visible="false" border_drop_shadow_visible="false"
171 font="SansSerif" mouse_opaque="true">
172 Login name:
173 </text>
174 <line_editor name="username_edit"
175 bottom_delta="-20" left_delta="0" height="20" width="250"
176 follows="left|bottom" font="SansSerif"
177 bevel_style="in" border_style="line" border_thickness="1"
178 max_length="63" mouse_opaque="true"
179 handle_edit_keys_directly="true"
180 select_all_on_focus_received="true"
181 allow_translate="false" />
182
183
179 <!-- ACCOUNT / FORGOT PASSWORD --> 184 <!-- ACCOUNT / FORGOT PASSWORD -->
180 185
181 <text name="create_new_account_text" 186 <text name="create_new_account_text"
182 bottom="69" left="-210" height="16" width="200" 187 bottom="45" left="-210" height="16" width="200"
183 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 188 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
184 bg_visible="false" drop_shadow_visible="true" 189 bg_visible="false" drop_shadow_visible="true"
185 border_visible="false" border_drop_shadow_visible="false" 190 border_visible="false" border_drop_shadow_visible="false"
@@ -189,7 +194,7 @@
189 </text> 194 </text>
190 195
191 <text name="forgot_password_text" 196 <text name="forgot_password_text"
192 bottom="49" left="-210" height="16" width="200" 197 bottom="25" left="-210" height="16" width="200"
193 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 198 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
194 bg_visible="false" drop_shadow_visible="true" 199 bg_visible="false" drop_shadow_visible="true"
195 border_visible="false" border_drop_shadow_visible="false" 200 border_visible="false" border_drop_shadow_visible="false"
@@ -202,7 +207,7 @@
202 <!-- CHANNEL & VERSION --> 207 <!-- CHANNEL & VERSION -->
203 208
204 <text name="channel_text" 209 <text name="channel_text"
205 bottom="29" left="-310" height="16" width="300" 210 bottom="5" left="-310" height="16" width="300"
206 follows="right|bottom" h_pad="0" halign="right" v_pad="0" 211 follows="right|bottom" h_pad="0" halign="right" v_pad="0"
207 bg_visible="false" drop_shadow_visible="true" 212 bg_visible="false" drop_shadow_visible="true"
208 border_visible="false" border_drop_shadow_visible="false" 213 border_visible="false" border_drop_shadow_visible="false"
@@ -210,11 +215,4 @@
210 hover="true" hover_color="50 115 185"> 215 hover="true" hover_color="50 115 185">
211 [VERSION] 216 [VERSION]
212 </text> 217 </text>
213
214
215 <web_browser name="news_bar"
216 bottom="0" top="20" left="0" right="-1"
217 border_visible="true" follows="left|bottom|right"
218 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000%22%3E%3C/body%3E%3C/html%3E" />
219
220</panel> 218</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index b6deee9..aedda8a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -18,7 +18,6 @@ USE left="270" FOR TABBING OPTIONS
18 height="408" label="Advanced" left="102" mouse_opaque="true" 18 height="408" label="Advanced" left="102" mouse_opaque="true"
19 name="advanced_panel" width="517"> 19 name="advanced_panel" width="517">
20 20
21
22 <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false" 21 <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
23 name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0"> 22 name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
24 23
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 2e92689..c505e1d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -318,7 +318,7 @@ USE left="270" FOR TABBING OPTIONS
318 <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTreeLODFactor" 318 <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTreeLODFactor"
319 decimal_digits="3" enabled="true" follows="left|top" height="16" 319 decimal_digits="3" enabled="true" follows="left|top" height="16"
320 increment="0.125" initial_val="160" label=" Trees:" 320 increment="0.125" initial_val="160" label=" Trees:"
321 label_width="140" left_delta="0" max_val="1" min_val="0" 321 label_width="140" left_delta="0" max_val="12" min_val="0"
322 mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" /> 322 mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
323 <slider bottom_delta="-18" can_edit_text="false" control_name="RenderAvatarLODFactor" 323 <slider bottom_delta="-18" can_edit_text="false" control_name="RenderAvatarLODFactor"
324 decimal_digits="3" enabled="true" follows="left|top" height="16" 324 decimal_digits="3" enabled="true" follows="left|top" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 05658f6..93bc84c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -99,6 +99,9 @@ USE left="270" FOR TABBING OPTIONS
99 <button bottom_delta="-30" follows="top|left" height="20" label="Auto-Response Options" 99 <button bottom_delta="-30" follows="top|left" height="20" label="Auto-Response Options"
100 left_delta="0" name="busy_adv_btn" tool_tip="Instant message Auto-Response options" 100 left_delta="0" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
101 width="160" font="SansSerifSmall" /> 101 width="160" font="SansSerifSmall" />
102 <button bottom_delta="0" follows="left|top" height="22" label="OTR Options"
103 left_delta="200" name="otr_adv_btn" tool_tip="Off The Record options"
104 width="120" />
102 105
103 <string name="log_in_to_change"> 106 <string name="log_in_to_change">
104 log in to change 107 log in to change
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 57d8f31..6e68c0e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -345,8 +345,8 @@ USE left="270" FOR TABBING OPTIONS
345 My external browser (Firefox, Safari, Internet Explorer, etc.) 345 My external browser (Firefox, Safari, Internet Explorer, etc.)
346 </radio_item> 346 </radio_item>
347 <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 347 <radio_item bottom="-40" height="20" left="0" name="internal" width="480"
348 tool_tip="Use the internal browser for help, web links, etc. This browser opens as a new window inside Imprudence."> 348 tool_tip="Use the internal browser for help, web links, etc. This browser opens as a new window inside the viewer.">
349 Imprudence's internal browser 349 Viewer's internal browser
350 </radio_item> 350 </radio_item>
351 </radio_group> 351 </radio_group>
352 352
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 53c29c1..625d6e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -35,36 +35,40 @@ USE left="270" FOR TABBING OPTIONS
35 35
36 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="50" 36 <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="50"
37 name="skin_selection" width="480"> 37 name="skin_selection" width="480">
38 <radio_item bottom="-20" height="20" left="0" name="default" width="480"> 38 <radio_item bottom="-20" height="20" left="0" name="pslpurple" width="480">
39 Default 39 PSL purple
40 </radio_item> 40 </radio_item>
41 <radio_item bottom_delta="-50" height="20" left="0" name="silver" width="480"> 41 <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480">
42 Silver 42 gemini
43 </radio_item> 43 </radio_item>
44 <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480"> 44 <radio_item bottom_delta="-50" height="20" left="0" name="dark" width="480">
45 Dark 45 dark
46 </radio_item> 46 </radio_item>
47 <radio_item bottom_delta="-50" height="20" left="0" name="gemini" width="480"> 47 <radio_item bottom_delta="-50" height="20" left="0" name="default" width="480">
48 Gemini 48 Classic
49 </radio_item> 49 </radio_item>
50 </radio_group> 50 </radio_group>
51 51
52 <button left="130" bottom="-125" width="216" height="95" name="classic_preview" 52 <button left="150" bottom="-130" width="216" height="95" name="pslpurple_preview"
53 scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png"
54 image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png"
55 image_hover_unselected="skin_thumbnail_pslpurple.png" follows="left|top" />
56
57 <button left="150" bottom_delta="-100" width="216" height="95" name="gemini_preview"
58 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png"
59 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png"
60 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
61
62 <button left="150" bottom_delta="-100" width="216" height="95" name="dark_preview"
63 scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
64 image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
65 image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
66
67 <button left="150" bottom_delta="-100" width="216" height="95" name="classic_preview"
53 scale_image="true" label="" image_selected="skin_thumbnail_default.png" 68 scale_image="true" label="" image_selected="skin_thumbnail_default.png"
54 image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" 69 image_hover_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png"
55 image_hover_unselected="skin_thumbnail_default.png" follows="left|top" /> 70 image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
56 <button left="130" bottom_delta="-100" width="216" height="95" name="silver_preview" 71
57 scale_image="true" label="" image_selected="skin_thumbnail_silver.png"
58 image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png"
59 image_hover_unselected="skin_thumbnail_silver.png" follows="left|top" />
60 <button left="130" bottom_delta="-100" width="216" height="95" name="dark_preview"
61 scale_image="true" label="" image_selected="skin_thumbnail_dark.png"
62 image_hover_selected="skin_thumbnail_dark.png" image_unselected="skin_thumbnail_dark.png"
63 image_hover_unselected="skin_thumbnail_dark.png" follows="left|top" />
64 <button left="130" bottom_delta="-100" width="216" height="95" name="gemini_preview"
65 scale_image="true" label="" image_selected="skin_thumbnail_gemini.png"
66 image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png"
67 image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
68 <text name="skin_current_text" font-style="BOLD|SHADOW" 72 <text name="skin_current_text" font-style="BOLD|SHADOW"
69 left="20" bottom="5" halign="left" height="12" 73 left="20" bottom="5" halign="left" height="12"
70 follows="left|bottom" h_pad="0" v_pad="0" 74 follows="left|bottom" h_pad="0" v_pad="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 46ba64a..0169f38 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -101,7 +101,7 @@
101 <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall" 101 <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
102 halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png" 102 halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
103 label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn" 103 label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
104 tool_tip="Search Second Life" width="16" scale_image="false"/> 104 tool_tip="Search the grid" width="16" scale_image="false"/>
105 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 105 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
106 bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall" 106 bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
107 halign="center" height="12" left="-20" mouse_opaque="true" 107 halign="center" height="12" left="-20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bac41bc..1c59430 100644
--- a/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -84,7 +84,7 @@
84 longdescription="Change streaming music and movie settings in About Land &gt; Media tab." 84 longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
85 name="land change media" value="20" /> 85 name="land change media" value="20" />
86 <action description="Toggle &apos;Edit Terrain&apos;" 86 <action description="Toggle &apos;Edit Terrain&apos;"
87 longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab." 87 longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move prim plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
88 name="land edit" value="21" /> 88 name="land edit" value="21" />
89 <action description="Toggle various About Land &gt; Options settings" 89 <action description="Toggle various About Land &gt; Options settings"
90 longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab." 90 longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
@@ -126,7 +126,7 @@
126 name="land admin" value="32" /> 126 name="land admin" value="32" />
127 </action_set> 127 </action_set>
128 <action_set 128 <action_set
129 description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." 129 description="These Abilities include powers to allow members to return objects and place and move prim plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
130 name="Parcel Content"> 130 name="Parcel Content">
131 <action description="Return objects owned by group" 131 <action description="Return objects owned by group"
132 longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." 132 longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
@@ -137,8 +137,8 @@
137 <action description="Return non-group objects" 137 <action description="Return non-group objects"
138 longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." 138 longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
139 name="land return non group" value="34" /> 139 name="land return non group" value="34" />
140 <action description="Landscaping using Linden plants" 140 <action description="Landscaping using prim plants"
141 longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button." 141 longdescription="Landscaping ability to place and move prim trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
142 name="land gardening" value="35" /> 142 name="land gardening" value="35" />
143 </action_set> 143 </action_set>
144 <action_set 144 <action_set
generated by cgit v1.1 at 2024-12-28 04:34:54 +0000