aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorKakurady2011-06-01 15:25:41 -0400
committerKakurady2011-06-01 16:11:09 -0400
commit7f2f26819f8220faf0e67411bf8401ab750f7997 (patch)
tree075caf7ce15d76bec3943bd52d40f3db535354f7 /linden
parentTranslated all XUI text added in Imprudence after 1.23 into Chinese. (diff)
downloadmeta-impy-7f2f26819f8220faf0e67411bf8401ab750f7997.zip
meta-impy-7f2f26819f8220faf0e67411bf8401ab750f7997.tar.gz
meta-impy-7f2f26819f8220faf0e67411bf8401ab750f7997.tar.bz2
meta-impy-7f2f26819f8220faf0e67411bf8401ab750f7997.tar.xz
Minor improvements in interface text
Mostly, use of unicode symbols instead of ASCII approximations
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about.xml38
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml102
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml2
5 files changed, 80 insertions, 80 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 0b73d9b..863992c 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
@@ -49,7 +49,7 @@
49 For a complete list of who did what, read the release notes! 49 For a complete list of who did what, read the release notes!
50 50
51 51
52 Second Life Copyright (C) 1999-2009 Linden Research Inc. 52 Second Life Copyright © 1999-2009 Linden Research Inc.
53 53
54 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. 54 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.
55 55
@@ -60,24 +60,24 @@
60 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, 60 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,
61 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 61 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
62 62
63 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion 63 3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
64 APR Copyright (C) 2000-2004 The Apache Software Foundation 64 APR Copyright © 2000-2004 The Apache Software Foundation
65 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) 65 cURL Copyright © 1996-2002, Daniel Stenberg, (daniel@haxx.se)
66 DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. 66 DBus/dbus-glib Copyright © 2002, 2003 CodeFactory AB / Copyright © 2003, 2004 Red Hat, Inc.
67 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. 67 expat Copyright © 1998, 1999, 2000 Thai Open Source Software Center Ltd.
68 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). 68 FreeType Copyright © 1996-2002, The FreeType Project (www.freetype.org).
69 GL Copyright (C) 1999-2004 Brian Paul. 69 GL Copyright © 1999-2004 Brian Paul.
70 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. 70 Havok.com(TM) Copyright © 1999-2001, Telekinesys Research Limited.
71 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) 71 jpeg2000 Copyright © 2001, David Taubman, The University of New South Wales (UNSW)
72 jpeglib Copyright (C) 1991-1998, Thomas G. Lane. 72 jpeglib Copyright © 1991-1998, Thomas G. Lane.
73 ogg/vorbis Copyright (C) 2001, Xiphophorus 73 ogg/vorbis Copyright © 2001, Xiphophorus
74 OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. 74 OpenSSL Copyright © 1998-2002 The OpenSSL Project.
75 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga 75 SDL Copyright © 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
76 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 76 SSLeay Copyright © 1995-1998 Eric Young (eay@cryptsoft.com)
77 xmlrpc-epi Copyright (C) 2000 Epinions, Inc. 77 xmlrpc-epi Copyright © 2000 Epinions, Inc.
78 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. 78 zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
79 google-perftools Copyright (c) 2005, Google Inc. 79 google-perftools Copyright © 2005, Google Inc.
80 Code from FAAD2 is copyright (c) Nero AG, www.nero.com 80 Code from FAAD2 is copyright © Nero AG, www.nero.com
81 81
82 All rights reserved. See LICENSE-libraries.txt for details. 82 All rights reserved. See LICENSE-libraries.txt for details.
83 83
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 439b102..42f1395 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1733,7 +1733,7 @@ Cannot find the region this land is in.
1733 type="alertmodal"> 1733 type="alertmodal">
1734Unable to buy land: 1734Unable to buy land:
1735 1735
1736Your allowed/preferred maturity level does not permit you to buy this land. You may need to your maturity level in Preferences first. 1736Your allowed/preferred maturity level does not permit you to buy this land. You may need to adjust your maturity level in Preferences first.
1737</notification> 1737</notification>
1738 1738
1739<notification 1739<notification
@@ -6920,44 +6920,44 @@ The URL you clicked cannot be opened from this web browser.
6920 type="alert"> 6920 type="alert">
6921The following constants are accepted in this tab: 6921The following constants are accepted in this tab:
6922 6922
6923PX -- X-axis position 6923PX X-axis position
6924PY -- Y-axis position 6924PY Y-axis position
6925PZ -- Z-axis position 6925PZ Z-axis position
6926SX -- X-axis size 6926SX X-axis size
6927SY -- Y-axis size 6927SY Y-axis size
6928SZ -- Z-axis size 6928SZ Z-axis size
6929RX -- X-axis rotation 6929RX X-axis rotation
6930RY -- Y-axis rotation 6930RY Y-axis rotation
6931RZ -- Z-axis rotation 6931RZ Z-axis rotation
6932CB -- Path cut begin 6932CB Path cut begin
6933CE -- Path cut end 6933CE Path cut end
6934HLW -- Hollow size 6934HLW Hollow size
6935SKW -- Skew 6935SKW Skew
6936PB -- Slice/Dimple/Profile cut begin 6936PB Slice/Dimple/Profile cut begin
6937PE -- Slice/Dimple/Profile cut end 6937PE Slice/Dimple/Profile cut end
6938TB -- Twist begin 6938TB Twist begin
6939TE -- Twist end 6939TE Twist end
6940SHX -- X-axis top shear 6940SHX X-axis top shear
6941SHY -- Y-axis top shear 6941SHY Y-axis top shear
6942HLX -- X-axis hole size 6942HLX X-axis hole size
6943HLY -- Y-axis hole size 6943HLY Y-axis hole size
6944TPX -- X-axis taper 6944TPX X-axis taper
6945TPY -- Y-axis taper 6945TPY Y-axis taper
6946ROF -- Radius offset 6946ROF Radius offset
6947REV -- Revolutions 6947REV Revolutions
6948 6948
6949PI -- pi 6949PI π
6950TWO_PI -- 2pi 6950TWO_PI 2π
6951PI_BY_TWO -- pi/2 6951PI_BY_TWO π/2
6952SQRT2 -- Square root of 2 6952SQRT2 Square root of 2
6953DEG_TO_RAD -- DEG_TO_RAD conversion (pi/180) 6953DEG_TO_RAD degrees to radians (pi/180)
6954RAD_TO_DEG -- RAD_TO_DEG conversion (180/pi) 6954RAD_TO_DEG radians to degrees (180/pi)
6955GRAVITY -- -9.8 6955GRAVITY -9.8
6956 6956
6957* -- Multiplication 6957* Multiplication
6958\ -- Division 6958\ Division
6959 -- Addition 6959 Addition
6960- -- Subtraction 6960- Subtraction
6961 6961
6962For information about this feature, click "More Info". 6962For information about this feature, click "More Info".
6963 <url option="1" name="url"> 6963 <url option="1" name="url">
@@ -6975,18 +6975,18 @@ For information about this feature, click "More Info".
6975 type="alert"> 6975 type="alert">
6976The following constants are accepted in this tab: 6976The following constants are accepted in this tab:
6977 6977
6978TSU -- Repeats per face (horizontal) 6978TSU Repeats per face (horizontal)
6979TSV -- Repeats per face (vertical) 6979TSV Repeats per face (vertical)
6980TOU -- Offsets per face (horizontal) 6980TOU Offsets per face (horizontal)
6981TOV -- Offsets per face (vertical) 6981TOV Offsets per face (vertical)
6982TRNS -- Transparency 6982TRNS Transparency
6983TROT -- Texture rotation 6983TROT Texture rotation
6984GLOW -- Glow 6984GLOW Glow
6985 6985
6986* -- Multiplication 6986* Multiplication
6987\ -- Division 6987\ Division
6988 -- Addition 6988 Addition
6989- -- Subtraction 6989- Subtraction
6990 6990
6991For information about this feature, click "More Info". 6991For information about this feature, click "More Info".
6992 <url option="1" name="url"> 6992 <url option="1" name="url">
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 a5d1e7d..2e92689 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
@@ -52,25 +52,25 @@ USE left="270" FOR TABBING OPTIONS
52 height="18" left="185" max_chars="20" mouse_opaque="true" 52 height="18" left="185" max_chars="20" mouse_opaque="true"
53 name="windowsize combo" width="160"> 53 name="windowsize combo" width="160">
54 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600"> 54 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
55 800x600 55 800×600
56 </combo_item> 56 </combo_item>
57 <combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480"> 57 <combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
58 720x480 (NTSC) 58 720×480 (NTSC)
59 </combo_item> 59 </combo_item>
60 <combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576"> 60 <combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576">
61 768x576 (PAL) 61 768×576 (PAL)
62 </combo_item> 62 </combo_item>
63 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768"> 63 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
64 1024x768 64 1024×768
65 </combo_item> 65 </combo_item>
66 <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720"> 66 <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
67 1280x720 (HDV720) 67 1280×720 (HDV720)
68 </combo_item> 68 </combo_item>
69 <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080"> 69 <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
70 1440x1080 (HDV1080) 70 1440×1080 (HDV1080)
71 </combo_item> 71 </combo_item>
72 <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080"> 72 <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
73 1920x1080 (HD1080) 73 1920×1080 (HD1080)
74 </combo_item> 74 </combo_item>
75 </combo_box> 75 </combo_box>
76 <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top" 76 <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
@@ -411,7 +411,7 @@ USE left="270" FOR TABBING OPTIONS
411 411
412 412
413 <string name="resolution_format"> 413 <string name="resolution_format">
414 [RES_X] x [RES_Y] 414 [RES_X] × [RES_Y]
415 </string> 415 </string>
416 <string name="aspect_ratio_text"> 416 <string name="aspect_ratio_text">
417 [NUM]:[DEN] 417 [NUM]:[DEN]
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 175e4da..57d8f31 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,7 +345,7 @@ 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 Second Life."> 348 tool_tip="Use the internal browser for help, web links, etc. This browser opens as a new window inside Imprudence.">
349 Imprudence's internal browser 349 Imprudence's internal browser
350 </radio_item> 350 </radio_item>
351 </radio_group> 351 </radio_group>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 5dd738a..bcbff32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -25,7 +25,7 @@ regions in the estate.
25 (unknown) 25 (unknown)
26 </text> 26 </text>
27 <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295" 27 <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
28 follows="top|left" height="350" left="6" width="250" /> 28 follows="top|left" height="290" left="6" width="250" />
29 <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time" 29 <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
30 left="12" name="use_global_time_check" width="200" /> 30 left="12" name="use_global_time_check" width="200" />
31 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" 31 <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"