aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/xui/en-us
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/skins/xui/en-us')
-rw-r--r--linden/indra/newview/skins/xui/en-us/floater_about.xml7
-rw-r--r--linden/indra/newview/skins/xui/en-us/panel_login.xml2
2 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index fbfebf0..e9bb109 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -7,9 +7,9 @@
7 follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6" 7 follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
8 max_length="65536" mouse_opaque="true" name="credits_editor" 8 max_length="65536" mouse_opaque="true" name="credits_editor"
9 text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458" 9 text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
10 word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica and many others. 10 word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa and many others.
11 11
12Thank you to the following residents for helping to ensure that this is the best version yet: Hypatia Callisto, Inigo Chamerberlin, Matti Deigan, Jasper Dogpatch, Able Forder, Evy Gardenvale, Bosco Gray, Torben Jensen, Claire Kanno, bebop Kohime, Michael Kyuzo, Sian Lumley, Chase McClure, Lisa McConnell, Alice Obscure, Stumbelina Ophelia, Arenae Rosewood, Joseph Rustamova, Norm Schack, Funk Schnook, Teleio Seferis, Ninnie Stradling, Darzus Strutt, Glory Takashi, Omei Turnbull, Craig Weiland, Johan Yugen, xsdenied Zucker. 12Thank you to the following residents for helping to ensure that this is the best version yet: Gate Bates, Henri Beauchamp, zinoplatinium Burton, Celeste Eerie, Sara Flinker, skyking Heron, sakura Jannings, Arth Karas, Trevor Langdon, tamara Levitsky, Donuma Masala, Keith Mathieson, Ima Mechanique, Venus Medusa, Alice Obscure, Glenn Rotaru, Norm Schack, Singular Seoul, Rhyph Somme, Amy Sukra, Omei Turnbull, Fehan Villota
13 13
14APR Copyright (C) 2000-2004 The Apache Software Foundation 14APR Copyright (C) 2000-2004 The Apache Software Foundation
15Cg Copyright (C) 2002, NVIDIA Corporationa. 15Cg Copyright (C) 2002, NVIDIA Corporationa.
@@ -30,7 +30,8 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
30All rights reserved. See licenses.txt for details. 30All rights reserved. See licenses.txt for details.
31 31
32 32
33Bananas are the new plywood cubes.</text_editor> 33
34Viva la LiberaciĆ³n!</text_editor>
34 <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false" 35 <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
35 follows="left|top|right|bottom" font="SansSerif" height="238" left="6" 36 follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
36 max_length="65536" mouse_opaque="true" name="support_editor" 37 max_length="65536" mouse_opaque="true" name="support_editor"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index ba4884d..6652a63 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -64,7 +64,7 @@
64 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 64 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
65 bottom="74" drop_shadow_visible="true" follows="left|bottom" 65 bottom="74" drop_shadow_visible="true" follows="left|bottom"
66 font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false" 66 font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false"
67 left="32" mouse_opaque="true" name="full_screen_text" v_pad="0" width="252"> 67 left="32" mouse_opaque="true" name="full_screen_text" v_pad="0" width="300">
68 Viewer will display full screen when logged in. 68 Viewer will display full screen when logged in.
69 </text> 69 </text>
70 <button bottom="46" follows="left|bottom" font="SansSerif" halign="center" height="24" 70 <button bottom="46" follows="left|bottom" font="SansSerif" halign="center" height="24"