diff options
Diffstat (limited to 'indra/newview/skins')
81 files changed, 1780 insertions, 1348 deletions
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png Binary files differindex 909334d862..fdd65b49e1 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Group.png +++ b/indra/newview/skins/default/textures/icons/Generic_Group.png diff --git a/indra/newview/skins/default/textures/icons/Generic_Person.png b/indra/newview/skins/default/textures/icons/Generic_Person.png Binary files differindex 01618ce2c0..45b491ab59 100644 --- a/indra/newview/skins/default/textures/icons/Generic_Person.png +++ b/indra/newview/skins/default/textures/icons/Generic_Person.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 8440022844..46c294768d 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -514,6 +514,9 @@ <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" /> + <texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" /> + <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" /> + <!--TODO: REPLACE CODE REFERENCE TO THIS ART WITH Icon_Minimize_Background above --> <texture name="minimize_inactive.tga" preload="true" /> <texture name="minimize.tga" preload="true" /> diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml index 6b52da04d0..81d4d3fdfd 100644 --- a/indra/newview/skins/default/xui/da/floater_about.xml +++ b/indra/newview/skins/default/xui/da/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="floater_about" title="Om [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life er gjort muligt for dig af 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. Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + +I get by with a little help from my friends. --Richard Starkey + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -26,10 +35,9 @@ Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste v Alle rettigheder forbeholdes. Se licenses.txt for detaljer. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - -I get by with a little help from my friends. --Richard Starkey </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Du er ved [POSITION] </string> diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml index b30205310a..f618548908 100644 --- a/indra/newview/skins/default/xui/da/floater_map.xml +++ b/indra/newview/skins/default/xui/da/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- Ø
- </floater.string>
- <floater.string name="mini_map_west">
- V
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SØ
- </floater.string>
- <floater.string name="mini_map_northeast">
- NØ
- </floater.string>
- <floater.string name="mini_map_southwest">
- SV
- </floater.string>
- <floater.string name="mini_map_northwest">
- NV
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="Ø" name="floater_map_east" text="Ø">
- Ø
- </text>
- <text label="V" name="floater_map_west" text="V">
- V
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SØ" name="floater_map_southeast" text="SØ">
- SØ
- </text>
- <text label="NØ" name="floater_map_northeast" text="NØ">
- NØ
- </text>
- <text label="SV" name="floater_map_southwest" text="SV">
- SV
- </text>
- <text label="NV" name="floater_map_northwest" text="NV">
- NV
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + Ø + </floater.string> + <floater.string name="mini_map_west"> + V + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SØ + </floater.string> + <floater.string name="mini_map_northeast"> + NØ + </floater.string> + <floater.string name="mini_map_southwest"> + SV + </floater.string> + <floater.string name="mini_map_northwest"> + NV + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="Ø" name="floater_map_east" text="Ø"> + Ø + </text> + <text label="V" name="floater_map_west" text="V"> + V + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SØ" name="floater_map_southeast" text="SØ"> + SØ + </text> + <text label="NØ" name="floater_map_northeast" text="NØ"> + NØ + </text> + <text label="SV" name="floater_map_southwest" text="SV"> + SV + </text> + <text label="NV" name="floater_map_northwest" text="NV"> + NV + </text> +</floater> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index 61f27d5543..d3d017914d 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="bredde / højde">
- Format:
- </text>
- <combo_box name="aspect_ratio" tool_tip="bredde/ højde">
- <combo_box.item label="4:3 (Standard CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Widescreen)" name="item3"/>
- <combo_box.item label="16:9 (Widescreen)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="bredde / højde"> + Format: + </text> + <combo_box name="aspect_ratio" tool_tip="bredde/ højde"> + <combo_box.item label="4:3 (Standard CRT)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Widescreen)" name="item3"/> + <combo_box.item label="16:9 (Widescreen)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml index b835180a88..d2ae3ab116 100644 --- a/indra/newview/skins/default/xui/da/panel_world_map.xml +++ b/indra/newview/skins/default/xui/da/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- Ø
- </panel.string>
- <panel.string name="world_map_west">
- V
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SØ
- </panel.string>
- <panel.string name="world_map_northeast">
- NØ
- </panel.string>
- <panel.string name="world_map_southwest">
- SV
- </panel.string>
- <panel.string name="world_map_northwest">
- NV
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="Ø" name="floater_map_east" text="Ø">
- Ø
- </text>
- <text label="V" name="floater_map_west" text="V">
- V
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SØ" name="floater_map_southeast" text="SØ">
- SØ
- </text>
- <text label="NØ" name="floater_map_northeast" text="NØ">
- NØ
- </text>
- <text label="SV" name="floater_map_southwest" text="SV">
- SV
- </text>
- <text label="NV" name="floater_map_northwest" text="NV">
- NV
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + Ø + </panel.string> + <panel.string name="world_map_west"> + V + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SØ + </panel.string> + <panel.string name="world_map_northeast"> + NØ + </panel.string> + <panel.string name="world_map_southwest"> + SV + </panel.string> + <panel.string name="world_map_northwest"> + NV + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="Ø" name="floater_map_east" text="Ø"> + Ø + </text> + <text label="V" name="floater_map_west" text="V"> + V + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SØ" name="floater_map_southeast" text="SØ"> + SØ + </text> + <text label="NØ" name="floater_map_northeast" text="NØ"> + NØ + </text> + <text label="SV" name="floater_map_southwest" text="SV"> + SV + </text> + <text label="NV" name="floater_map_northwest" text="NV"> + NV + </text> +</panel> diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml index 340b90d802..d36f5a43f6 100644 --- a/indra/newview/skins/default/xui/de/floater_about.xml +++ b/indra/newview/skins/default/xui/de/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="floater_about" title="Über [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life wird Ihnen präsentiert von 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 und vielen anderen. Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + +Um im Geschäftsleben erfolreich zu sein, sei kühn, sei schnell, sei anders. --Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -25,10 +34,9 @@ google-perftools Copyright (c) 2005, Google Inc. Alle Rechte vorbehalten. Details siehe licenses.txt. Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf.G.722.1 Anhang C) - - -Um im Geschäftsleben erfolreich zu sein, sei kühn, sei schnell, sei anders. --Henry Marchant </text_editor> + </panel> +</tab_container> <text name="you_are_at"> Sie befinden sich in [POSITION] </text> diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml index a875d4aa90..97b3d76a46 100644 --- a/indra/newview/skins/default/xui/de/floater_map.xml +++ b/indra/newview/skins/default/xui/de/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- O
- </floater.string>
- <floater.string name="mini_map_west">
- W
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SO
- </floater.string>
- <floater.string name="mini_map_northeast">
- NO
- </floater.string>
- <floater.string name="mini_map_southwest">
- SW
- </floater.string>
- <floater.string name="mini_map_northwest">
- NW
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="O" name="floater_map_east" text="O">
- O
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SO" name="floater_map_southeast" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northeast" text="NO">
- NO
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + O + </floater.string> + <floater.string name="mini_map_west"> + W + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SO + </floater.string> + <floater.string name="mini_map_northeast"> + NO + </floater.string> + <floater.string name="mini_map_southwest"> + SW + </floater.string> + <floater.string name="mini_map_northwest"> + NW + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="O" name="floater_map_east" text="O"> + O + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SO" name="floater_map_southeast" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northeast" text="NO"> + NO + </text> + <text label="SW" name="floater_map_southwest" text="SW"> + SW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</floater> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml index f84aa06b32..c7833f6936 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="Breite/Höhe">
- Aspektverhältnis:
- </text>
- <combo_box name="aspect_ratio" tool_tip="Breite/Höhe">
- <combo_box.item label="4:3 (Standard-CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Widescreen)" name="item3"/>
- <combo_box.item label="16:9 (Widescreen)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="Breite/Höhe"> + Aspektverhältnis: + </text> + <combo_box name="aspect_ratio" tool_tip="Breite/Höhe"> + <combo_box.item label="4:3 (Standard-CRT)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Widescreen)" name="item3"/> + <combo_box.item label="16:9 (Widescreen)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml index eaea377c0d..7b18c5e822 100644 --- a/indra/newview/skins/default/xui/de/panel_world_map.xml +++ b/indra/newview/skins/default/xui/de/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- O
- </panel.string>
- <panel.string name="world_map_west">
- W
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SO
- </panel.string>
- <panel.string name="world_map_northeast">
- NO
- </panel.string>
- <panel.string name="world_map_southwest">
- SW
- </panel.string>
- <panel.string name="world_map_northwest">
- NW
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="O" name="floater_map_east" text="O">
- O
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SO" name="floater_map_southeast" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northeast" text="NO">
- NO
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + O + </panel.string> + <panel.string name="world_map_west"> + W + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SO + </panel.string> + <panel.string name="world_map_northeast"> + NO + </panel.string> + <panel.string name="world_map_southwest"> + SW + </panel.string> + <panel.string name="world_map_northwest"> + NW + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="O" name="floater_map_east" text="O"> + O + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SO" name="floater_map_southeast" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northeast" text="NO"> + NO + </text> + <text label="SW" name="floater_map_southwest" text="SW"> + SW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</panel> diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml index 914a6eddb9..ea34bac0a7 100644 --- a/indra/newview/skins/default/xui/en/accordion_parent.xml +++ b/indra/newview/skins/default/xui/en/accordion_parent.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> - <panel border_thickness="2" name="splitter_parent" + <panel border_thickness="0" name="splitter_parent" background_visible="true" label="splitter_parent" title="" diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index e2f81168fa..dcd85e1f58 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -6,9 +6,13 @@ halign="center" height="23" image_disabled="transparent.j2c" - image_disabled_selected="PushButton_Selected" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" + image_disabled_selected="transparent.j2c" + image_selected="transparent.j2c" + image_unselected="transparent.j2c" + image_hover_selected="PushButton_Selected" + image_hover_unselected="PushButton_Off" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" hover_glow_amount="0.15" layout="topleft" left="2" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index f11391c5e0..5a285cdcb0 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1678,7 +1678,7 @@ Only large parcels can be listed in search. height="16" layout="topleft" left="10" - name="at URL:" + name="CurrentURL:" top="49" width="65"> Current URL: diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 897e5da4e8..ef6af28786 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -200,7 +200,7 @@ layout="topleft" height="16" left="10" - name="Group:" + name="GroupLabel" width="88"> Group: </text> @@ -218,7 +218,7 @@ follows="left|top" height="16" layout="topleft" - name="NextOwnerLabel" + name="AnyoneLabel" left="100" top="110" width="88"> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index 1592ed4aa4..0784b88944 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + can_dock="true" can_minimize="false" can_close="false" center_horiz="true" @@ -29,6 +30,7 @@ layout="topleft" left="0" top="0" + mouse_opaque="false" name="controls" width="105"> <joystick_rotate @@ -67,7 +69,7 @@ height="64" image_unselected="cam_zoom_out.tga" layout="topleft" - left_delta="74" + left_delta="70" minus_image="cam_zoom_minus_in.tga" name="zoom" picture_style="true" diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index a5d76821a8..be1278e8cc 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -9,7 +9,7 @@ help_topic="panel_im" top="0" can_dock="true" - can_minimize="false" + can_minimize="true" visible="true" width="315"> <layout_stack follows="left|top|right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index 3f5127561a..2a431edcdd 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -199,10 +199,10 @@ name="client" top_delta="0" width="128"> - Client: + Client </text> <text - visiblity_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" type="string" length="1" bottom="40" @@ -216,7 +216,7 @@ Normal </text> <text - visiblity_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" bottom="56" follows="left|top" height="16" @@ -248,10 +248,10 @@ name="network" top_delta="0" width="128"> - Network: + Network </text> <text - visiblity_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" type="string" length="1" bottom="80" @@ -265,7 +265,7 @@ Normal </text> <text - visiblity_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" bottom="96" follows="left|top" height="16" @@ -297,10 +297,10 @@ name="server" top_delta="0" width="60"> - Server: + Server </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" type="string" length="1" bottom="120" @@ -308,13 +308,13 @@ font="SansSerif" height="16" layout="topleft" - left="85" + left="110" name="server_text" right="-10"> Normal </text> <text - make_visible_control="LagMeterShrunk" + visiblity_control="LagMeterShrunk" bottom="136" follows="left|top" height="16" @@ -322,7 +322,7 @@ left="40" name="server_lag_cause" right="-32" /> - <button + <!--button bottom="145" follows="left|top" height="18" @@ -330,16 +330,16 @@ layout="topleft" name="server_help" right="-10" - width="18" /> + width="18" /--> <button follows="left|top" height="20" label=">>" layout="topleft" - left_delta="-317" + left="10" name="minimize" - top_delta="-2" - width="25"> + top_delta="4" + width="40"> <button.commit_callback function="LagMeter.ClickShrink" /> </button> diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index dc0ff7ac4c..82acea47be 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater + can_dock="true" can_close="false" can_minimize="false" center_horiz="true" @@ -41,6 +42,7 @@ follows="left|top" layout="topleft" left="0" + mouse_opaque="false" name="panel_actions" top="0" width="115"> @@ -95,7 +97,7 @@ scale_image="false" tool_tip="Fly Down, Press "C"" top_delta="0" - width="25" /> + width="20" /> <joystick_turn follows="left|bottom" height="25" diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 412df1d262..06a03ff340 100644 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml @@ -1,56 +1,63 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_minimize="false" - height="140" + height="130" layout="topleft" - name="mute by name" + name="block by name" help_topic="mute_by_name" title="Block object by name" width="375"> <text type="string" length="1" - bottom_delta="50" follows="top|left" - font="SansSerif" + font="SansSerifLarge" height="16" layout="topleft" - left="20" - left_delta="25" - name="message" - right="380"> - Block by name only affects object chat and IM, not sounds. -You must type the object's name exactly. + left="10" + top="25" + name="message"> + Block an object: </text> <line_editor type="string" length="1" follows="top|right" font="SansSerif" - height="18" + height="20" layout="topleft" left_delta="0" name="object_name" - top_pad="22" - width="320"> + top_pad="5" + width="350"> Object name </line_editor> + <text + type="string" + length="1" + follows="top|left" + font="SansSerifSmall" + height="16" + layout="topleft" + left="30" + name="note"> + * Only blocks object text, not sounds + </text> <button follows="bottom|left" - height="20" + height="23" label="Ok" layout="topleft" - left="108" + left="155" name="OK" - top="100" - width="75" /> + top_pad="10" + width="100" /> <button follows="bottom|right" - height="20" + height="23" label="Cancel" layout="topleft" - left_pad="7" + left_pad="5" name="Cancel" - top_delta="0" - width="75" /> + width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 3f31641cac..30406cad63 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -11,7 +11,7 @@ title="NOTIFICATIONS" width="320" min_width="320" - height="60" + height="23" can_minimize="false" can_tear_off="false" can_resize="false" @@ -19,36 +19,13 @@ can_close="false" can_dock="true" > - <scroll_container - follows="top|bottom" + <flat_list_view + color="FloaterDefaultBackgroundColor" + follows="all" layout="topleft" - name="notification_list_container" - left="0" - top="18" - width="320" - height="42"> - <panel - layout="topleft" - name="twin_list_panel" - left="1" - top="0" - width="318" - height="32" - bg_alpha_color="1.0 1.0 1.0 1.0"> - <scrolling_panel_list - layout="topleft" name="notification_list" left="1" - top="0" + top="20" height="0" width="318"/> - <scrolling_panel_list - layout="topleft" - name="im_row_panel_list" - left="1" - top="2" - height="0" - width="318"/> - </panel> -</scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index 2c14b3d87a..9a3d5aa183 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -48,8 +48,8 @@ <button follows="left|top" height="25" - label="Display Floater" - label_selected="Display Floater" + label="Show" + label_selected="Show" layout="topleft" left_pad="10" name="display_floater" @@ -60,8 +60,8 @@ enabled="false" follows="left|top" height="25" - label="Close Floater" - label_selected="Close Floater" + label="Hide" + label_selected="Hide" layout="topleft" left_pad="10" name="close_displayed_floater" @@ -71,8 +71,8 @@ <button follows="left|top" height="25" - label="Edit Floater..." - label_selected="Edit Floater..." + label="Edit..." + label_selected="Edit..." layout="topleft" left_pad="10" name="edit_floater" @@ -144,8 +144,7 @@ <button follows="left|top" height="25" - label="Display Floater" - label_selected="Display Floater" + label="Show" layout="topleft" left_pad="10" name="display_floater_2" @@ -156,8 +155,7 @@ enabled="false" follows="left|top" height="25" - label="Close Floater" - label_selected="Close Floater" + label="Hide" layout="topleft" left_pad="10" name="close_displayed_floater_2" diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml new file mode 100644 index 0000000000..e98920f8c2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu + height="201" + layout="topleft" + left="100" + mouse_opaque="false" + name="hide_camera_move_controls_menu" + top="624" + visible="false" + width="128"> + <menu_item_check + label="Gesture button" + layout="topleft" + name="ShowGestureButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowGestureButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowGestureButton" /> + </menu_item_check> + <menu_item_check + label="Move button" + layout="topleft" + name="ShowMoveButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowMoveButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowMoveButton" /> + </menu_item_check> + <menu_item_check + label="Camera button" + layout="topleft" + name="ShowCameraButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowCameraButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowCameraButton" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml index 1ad10abbeb..a175b3103f 100644 --- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml @@ -11,23 +11,23 @@ <menu_item_check label="Show Navigation Bar" layout="topleft" - name="Show Navigation Bar"> + name="ShowNavbarNavigationPanel"> <menu_item_check.on_click - function="HideNavbarMenu.Action" - parameter="show_navbar_navigation_panel" /> + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> <menu_item_check.on_check - function="HideNavbarMenu.EnableMenuItem" - parameter="show_navbar_navigation_panel" /> + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> </menu_item_check> <menu_item_check label="Show Favorites Bar" layout="topleft" - name="Show Favorites Bar"> + name="ShowNavbarFavoritesPanel"> <menu_item_check.on_click - function="HideNavbarMenu.Action" - parameter="show_navbar_favorites_panel" /> + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> <menu_item_check.on_check - function="HideNavbarMenu.EnableMenuItem" - parameter="show_navbar_favorites_panel" /> + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> </menu_item_check> </menu> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 7a0a78bb50..d3a2b2c66b 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -234,7 +234,7 @@ <menu_item_call label="Show Critical Message" layout="topleft" - name="TOS"> + name="Critical"> <menu_item_call.on_click function="ShowFloater" parameter="message_critical" /> diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml new file mode 100644 index 0000000000..ec8582f5b5 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<menu name="menu_group_plus" + left="0" bottom="0" visible="false" + mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> + <menu_item_check + label="Display Group Icons" + layout="topleft" + name="Display Group Icons"> + <menu_item_check.on_click + function="People.Groups.ViewSort.Action" + parameter="show_icons" /> + <menu_item_check.on_check + function="CheckControl" + parameter="GroupListShowIcons" /> + </menu_item_check> +</menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml new file mode 100644 index 0000000000..643336cf6c --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Avatar Context Menu"> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <menu_item_call.on_click + function="Avatar.Profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <menu_item_call.on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Call" + layout="topleft" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Share" + layout="topleft" + name="Share"> + <menu_item_call.on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <menu_item_call.on_click + function="Avatar.Pay" /> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="Block/Unblock"> + <menu_item_check.on_click + function="Avatar.BlockUnblock" /> + <menu_item_check.on_check + function="Avatar.CheckItem" + parameter="is_blocked" /> + <menu_item_check.on_enable + function="Avatar.EnableItem" + parameter="can_block" /> + </menu_item_check> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 88b0528e53..d9606de90d 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -2,8 +2,8 @@ <menu name="menu_group_plus" left="0" bottom="0" visible="false" mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="true"> - <menu_item_call name="sort_most" label="Sort by Most Speakers"> - <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_most" /> + <menu_item_call name="sort_most" label="Sort by Most Recent"> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" /> </menu_item_call> <menu_item_call name="sort_name" label="Sort by Name"> <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_name" /> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b430de2b7b..10aa23b715 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -127,12 +127,14 @@ <menu_item_call.on_click function="World.SetAway" /> </menu_item_call> + <menu_item_separator + layout="topleft"/> <menu_item_call label="Set Busy" layout="topleft" name="Set Busy"> <menu_item_call.on_click - function="World.SetBusy" /> + function="World.SetBusy"/> </menu_item_call> </menu> <menu_item_separator @@ -381,7 +383,7 @@ <menu_item_check.on_click function="Floater.Toggle" parameter="world_map" /> - </menu_item_check> + </menu_item_check> <menu_item_check label="Mini-Map" layout="topleft" @@ -395,7 +397,31 @@ parameter="mini_map" /> </menu_item_check> <menu_item_separator - layout="topleft" /> + layout="topleft" /> + <menu_item_check + label="Show Navigation Bar" + layout="topleft" + name="ShowNavbarNavigationPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarNavigationPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarNavigationPanel" /> + </menu_item_check> + <menu_item_check + label="Show Favorites Bar" + layout="topleft" + name="ShowNavbarFavoritesPanel"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowNavbarFavoritesPanel" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowNavbarFavoritesPanel" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Take Snapshot" layout="topleft" @@ -466,8 +492,6 @@ parameter="editor" /> </menu_item_call> </menu> - <menu_item_separator - layout="topleft" /> </menu> <menu create_jump_keys="true" @@ -820,14 +844,14 @@ function="Floater.Toggle" parameter="perm_prefs" /> </menu_item_call> - <menu_item_call + <!--menu_item_call label="Show Script Warning/Error Window" layout="topleft" name="Show Script Warning/Error Window"> <menu_item_call.on_click function="ShowFloater" parameter="script errors" /> - </menu_item_call> + </menu_item_call--> <menu_item_separator layout="topleft" /> <menu diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 80d501b63e..044194a4ed 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -996,6 +996,17 @@ There was a problem saving a compiled script due to the following reason: [REASO <notification icon="alertmodal.tga" + name="StartRegionEmpty" + type="alertmodal"> +Oops, Your Start Region is not defined. +Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="CouldNotStartStopScript" type="alertmodal"> Could not start or stop the script because the object it is on could not be found. diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index f211ae0ad6..d5ed0c986d 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -38,7 +38,7 @@ width="20" /> <text follows="left|right" - font="SansSerifBigBold" + font="SansSerifSmallBold" height="20" layout="topleft" left_pad="5" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 6449059ef0..90b331a39f 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - mouse_opaque="false" + mouse_opaque="true" background_visible="true" bg_alpha_color="0.25 0.25 0.25 1" bg_opaque_color="0.25 0.25 0.25 1" @@ -36,13 +36,13 @@ width="5"/> <layout_panel mouse_opaque="false" - auto_resize="false" + auto_resize="true" follows="left|right" height="28" layout="topleft" left="5" min_height="28" - width="600" + width="450" top="0" min_width="305" name="chat_bar" @@ -110,46 +110,13 @@ name="cam_panel" top_delta="-10" width="150"> - <split_button - follows="right" - height="18" - name="presets" - top="6" - width="35"> - <split_button.arrow_button - image_selected="camera_presets/camera_presets_arrow.png" - image_unselected="camera_presets/camera_presets_arrow.png" - image_disabled_selected="camera_presets/camera_presets_arrow.png" - image_disabled="camera_presets/camera_presets_arrow.png" - name="camera_presets" - tool_tip="Camera Presets" - /> - <split_button.item - image_selected="camera_presets/camera_presets_rear_view.png" - image_unselected="camera_presets/camera_presets_rear_view.png" - name="rear_view" - tool_tip="Rear View" - /> - <split_button.item - image_selected="camera_presets/camera_presets_34_view.png" - image_unselected="camera_presets/camera_presets_34_view.png" - name="group_view" - tool_tip="Group View" - /> - <split_button.item - image_selected="camera_presets/camera_presets_fron_view.png" - image_unselected="camera_presets/camera_presets_fron_view.png" - name="front_view" - tool_tip="Front View" - /> - </split_button> <button follows="right" height="20" is_toggle="true" - label="Camera" + label="View" layout="topleft" - left_pad="0" + left="0" tab_stop="false" tool_tip="Shows/Hide Camera controls" top="6" @@ -159,11 +126,28 @@ function="Button.SetFloaterToggle" parameter="camera" /> </button> + <button + follows="right" + name="camera_presets_btn" + top="6" + height="20" + width="20" + left_pad="0" + tab_stop="false" + is_toggle="true" + picture_style="true" + image_selected="toggle_button_selected" + image_unselected="toggle_button_off"> + <button.init_callback + function="Button.SetFloaterToggle" + parameter="camera_presets" + /> + </button> <split_button arrow_position="right" follows="right" height="18" - left_pad="0" + left_pad="4" name="snapshots" top="6" width="35"> diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 311caa4866..c4c8aa24c4 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -16,7 +16,10 @@ name="want_apply_text"> Do you want to apply these changes? </panel.string> - + <panel.string + name="group_join_btn"> + Join (L$[AMOUNT]) + </panel.string> <button layout="topleft" name="back" @@ -39,6 +42,18 @@ follows="top|left|right" mouse_opaque="true" name="group_name">(Loading...)</text> + <line_editor + follows="left|top" + font="SansSerif" + label="Type your new group name here" + layout="topleft" + left_delta="0" + max_length="35" + name="group_name_editor" + top_delta="5" + width="250" + height="20" + visible="true" /> <texture_picker follows="left|top" height="113" @@ -47,7 +62,7 @@ left="10" name="insignia" tool_tip="Click to choose a picture" - top_pad="15" + top_pad="5" width="100" /> <text type="string" @@ -72,11 +87,21 @@ use_ellipses="true" width="140" /> <button + follows="left|top" + left_delta="0" + top_pad="10" + height="20" + label="Join" + label_selected="Join" + name="btn_join" + visible="true" + width="65" /> + <button top="632" height="20" font="SansSerifSmall" - label="Apply" - label_selected="Apply" + label="Save" + label_selected="Save" name="btn_apply" left="5" width="65" /> @@ -93,13 +118,21 @@ <button top="632" height="20" - font="SansSerifSmall" label="Create" label_selected="Create" name="btn_create" left="5" visible="false" width="65" /> + <button + top="632" + left="75" + height="20" + label="Cancel" + label_selected="Cancel" + name="btn_cancel" + visible="false" + width="65" /> <accordion layout="topleft" left="2" width="296" top="135" height="500" follows="all" name="group_accordion"> <accordion_tab min_height="445" title="Group General" name="group_general_tab"> <panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/> diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml new file mode 100644 index 0000000000..3f49bfad36 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="24" + layout="topleft" + left="0" + name="group_list_item" + top="0" + width="320"> + <icon + follows="top|right|left" + height="24" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="320" /> + <icon + height="24" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="320" /> + <icon + follows="top|left" + height="18" + image_name="icon_group.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="group_icon" + top="4" + width="18" /> + <text + follows="left|right" + font="SansSerifSmall" + height="17" + layout="topleft" + left_pad="5" + name="group_name" + text_color="white" + top="7" + use_ellipses="true" + value="Unknown" + width="263" /> + <button + follows="right" + height="18" + image_disabled="Info" + image_disabled_selected="Info" + image_hover_selected="Info" + image_selected="Info" + image_unselected="Info" + layout="topleft" + name="info_btn" + picture_style="true" + right="-5" + top="4" + width="18" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index ace456918c..7db1b9e916 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -33,7 +33,17 @@ layout="topleft" left="5" mouse_opaque="true" - name="avatar" + name="avatar_icon" + top="5" + width="20" /> + <icon + follows="right" + height="20" + image_name="icon_top_pick.tga" + layout="topleft" + left="5" + mouse_opaque="true" + name="sys_msg_icon" top="5" width="20" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index d943b2ea23..e7fb3fa208 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="left|top|right|bottom" + follows="all" height="600" layout="topleft" left="0" @@ -22,11 +22,11 @@ <web_browser border_visible="false" bottom="600" - follows="top|left|bottom|right" + follows="all" layout="topleft" left="0" name="login_html" - hide_loading="true" + hide_loading="true" right="-1" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" top="1" /> @@ -44,10 +44,7 @@ First Name: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|bottom" - font="SansSerif" handle_edit_keys_directly="true" height="20" layout="topleft" @@ -55,8 +52,8 @@ max_length="31" name="first_name_edit" select_on_focus="true" - tool_tip="Enter first name here" - top_pad="4" + tool_tip="Second Life First Name" + top_pad="2" width="120" /> <text type="string" @@ -72,8 +69,6 @@ Last Name: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" @@ -83,7 +78,7 @@ max_length="31" name="last_name_edit" select_on_focus="true" - top_pad="4" + top_pad="2" width="120" /> <text type="string" @@ -99,8 +94,6 @@ Password: </text> <line_editor - border_style="line" - border_thickness="1" follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" @@ -110,27 +103,26 @@ max_length="16" name="password_edit" select_on_focus="true" - top_pad="4" + top_pad="2" width="120" /> <button follows="left|bottom" - height="24" + height="23" label="Log In" label_selected="Log In" layout="topleft" - left="435" + left="425" name="connect_btn" - top="548" - width="120" /> + top="546" + width="100" /> <combo_box allow_text_entry="true" follows="left|bottom" - height="18" + height="23" layout="topleft" - left_pad="15" + left_pad="5" name="server_combo" - top_delta="2" - width="120" /> + width="100" /> <text type="string" length="1" @@ -142,15 +134,15 @@ name="start_location_text" top="576" width="95"> - Start Location: + Start location: </text> <combo_box allow_text_entry="true" control_name="LoginLocation" follows="left|bottom" - height="18" + height="23" layout="topleft" - left_pad="2" + left_pad="0" max_chars="128" name="start_location_combo" top_delta="-2" @@ -172,13 +164,12 @@ control_name="RememberPassword" follows="left|bottom" height="16" - label="Remember password" + label="Remember me" layout="topleft" left_pad="10" name="remember_check" top_delta="3" width="138" /> - <text type="string" length="1" @@ -192,7 +183,7 @@ name="create_new_account_text" top="539" width="200"> - Sign up for account + Create a new account </text> <text type="string" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 13ceab7604..1178d75b2c 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -135,6 +135,7 @@ layout="topleft" left="5" name="favorite" + image_drag_indication="Arrow_Down" chevron_button_tool_tip="Show more of My Favorites" top="32" width="590" /> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 132a2d1dc5..786c39c5e9 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -127,7 +127,6 @@ color="DkGray" name="tab_online" title="Online"> <avatar_list - draw_heading="false" follows="all" height="150" layout="topleft" @@ -143,7 +142,6 @@ color="DkGray" name="tab_all" title="All"> <avatar_list - draw_heading="false" follows="all" height="230" layout="topleft" @@ -219,7 +217,6 @@ color="DkGray" name="groups_panel" width="313"> <group_list - draw_heading="false" follows="left|top|right|bottom" height="357" layout="topleft" @@ -240,7 +237,6 @@ color="DkGray" name="bottom_panel" width="313"> <button - enabled="false" follows="bottom|left" font="SansSerifBigBold" tool_tip="Change sort and view of Groups list" @@ -250,7 +246,7 @@ color="DkGray" image_unselected="OptionsMenu_Off" layout="topleft" left="10" - name="gear_btn" + name="groups_viewsort_btn" picture_style="true" top="5" width="18" /> @@ -307,7 +303,7 @@ color="DkGray" layout="topleft" name="recent_panel" width="313"> - <avatar_list_tmp + <avatar_list color="DkGray2" follows="left|top|right|bottom" height="357" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 37e873b6a8..686faab8eb 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -9,6 +9,7 @@ top="0" width="305"> <icon + follows="top|bottom|left|right" height="120" image_name="ListItem_Over" left="0" @@ -19,6 +20,7 @@ visible="false" width="305"/> <icon + follows="top|bottom|left|right" height="120" image_name="ListItem_Select" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index bceaedcdb4..d0bde77cf2 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -8,24 +8,16 @@ name="panel_picks" top="0" width="313"> - <scroll_container + <flat_list_view color="DkGray2" follows="left|top|right|bottom" height="495" layout="topleft" left="0" - name="profile_scroll" + name="picks_list" opaque="true" top="0" - width="313"> - <list - height="120" - layout="topleft" - left="0" - name="picks_list" - top="0" - width="305" /> - </scroll_container> + width="313" /> <panel background_visible="true" bevel_style="none" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index b492ee1dc3..8f710545d5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -18,13 +18,13 @@ name="aspect_ratio_text"> [NUM]:[DEN] </panel.string> - <check_box + <check_box control_name="UseChatBubbles" height="16" label="Bubble Chat" layout="topleft" left="30" - top="20" + top="10" name="bubble_text_chat" width="150" /> @@ -35,7 +35,7 @@ initial_value="1" label="Opacity" layout="topleft" - left="50" + left_delta="50" top_pad="5" label_width="50" name="bubble_chat_opacity" @@ -73,7 +73,7 @@ </text> <combo_box allow_text_entry="true" - height="25" + height="20" layout="topleft" left_pad="0" max_chars="100" @@ -119,9 +119,8 @@ length="1" height="10" left="30" - text_color="EmphasisColor" name="heading1" - top_pad="30" + top_pad="10" width="270"> Camera: </text> @@ -137,13 +136,12 @@ Camera: layout="topleft" label_width="100" label="View Angle" - left="30" + left_delta="50" max_val="2.97" min_val="0.17" name="camera_fov" show_text="false" width="240" /> - <slider can_edit_text="true" control_name="CameraOffsetScale" @@ -154,13 +152,14 @@ Camera: initial_value="1" layout="topleft" label="Distance" - left="30" + left_delta="0" label_width="100" max_val="3" min_val="0.5" name="camera_offset_scale" show_text="false" - width="240" /> + width="240" + top_pad="10"/> <text type="string" length="1" @@ -175,10 +174,11 @@ Automatic positioning for: height="20" label="Build/Edit" layout="topleft" - left="50" + left_delta="50" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode" - width="280" /> + width="280" + top_pad="10" /> <check_box control_name="AppearanceCameraMovement" height="16" @@ -193,9 +193,8 @@ Automatic positioning for: length="1" height="10" left="30" - text_color="EmphasisColor" name="heading3" - top_pad="30" + top_pad="10" width="270"> My Avatar: </text> @@ -204,24 +203,28 @@ My Avatar: height="20" label="Show me in Mouselook" layout="topleft" + left_delta="50" name="first_person_avatar_visible" - width="256" /> + width="256" + top_pad="10"/> <check_box control_name="ArrowKeysMoveAvatar" height="20" label="Arrow keys always move me" layout="topleft" - left="30" + left_delta="0" name="arrow_keys_move_avatar_check" - width="237" /> + width="237" + top_pad="0"/> <check_box control_name="TapTapHoldtoRun" height="20" label="Tap-tap-hold to run" layout="topleft" - left="30" + left_delta="0" name="tap_tap_hold_to_run" - width="237" /> + width="237" + top_pad="0"/> <!--menu_item_check label="Tap-Tap-Hold to Run" layout="topleft" @@ -237,9 +240,10 @@ My Avatar: height="20" label="Move my avatar's lips when speaking" layout="topleft" - left="30" + left_delta="0" name="enable_lip_sync" - width="237" /> + width="237" + top_pad="0" /> <!--menu_item_check label="Enable Lip Sync(Beta)" layout="topleft" @@ -251,6 +255,42 @@ My Avatar: function="ToggleControl" parameter="LipSyncEnabled" /> </menu_item_check--> + <check_box + control_name="test" + height="20" + label="Show script errors" + layout="topleft" + left="30" + name="first_person_avatar_visible" + width="256" + top_pad="10"/> + <radio_group + enabled_control="EnableVoiceChat" + control_name="VoiceEarLocation" + draw_border="false" + height="40" + layout="topleft" + left_delta="50" + name="ear_location" + top_pad="5" + width="364"> + <radio_item + height="16" + label="In chat" + layout="topleft" + left="3" + name="0" + top="3" + width="315" /> + <radio_item + height="16" + label="In window" + layout="topleft" + left_delta="0" + name="1" + top_delta="16" + width="315" /> + </radio_group> </panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 7f72c7b0e9..56ba5970f2 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -72,15 +72,16 @@ top_delta="0" value="[SECOND_LIFE]:" width="170" /> - <text + <expandable_text follows="left|top|right" height="90" layout="topleft" name="sl_description_edit" width="170" - word_wrap="true"> + expanded_bg_visible="true" + expanded_bg_color="black"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> + </expandable_text> </panel> <panel follows="left|top" @@ -112,15 +113,16 @@ top_delta="0" value="Real World:" width="175" /> - <text + <expandable_text follows="left|top|right" height="90" layout="topleft" name="fl_description_edit" width="180" - word_wrap="true"> + expanded_bg_visible="true" + expanded_bg_color="black"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> + </expandable_text> </panel> <text type="string" diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index a5c3be3349..f25c4bfbba 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -4,6 +4,7 @@ bottom="0" follows="left|top|right" height="30" + width="305" layout="topleft" left="0" name="sidetray_tab_panel"> diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml index 3ac15fe550..53ee0d159d 100644 --- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml +++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml @@ -4,7 +4,7 @@ <panel name="sys_well_item" title="sys_well_item" - visible="false" + visible="true" top="0" left="0" width="318" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 70198dc626..a0fc986423 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -13,10 +13,9 @@ <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="today" title="Today"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -24,20 +23,16 @@ left="0" name="today_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="yesterday" title="Yesterday"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -45,20 +40,33 @@ left="0" name="yesterday_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> + </accordion_tab> + + <accordion_tab + can_resize="false" + layout="topleft" + name="2_days_ago" + title="2 days ago"> + <flat_list_view + draw_heading="false" + follows="all" + height="150" + layout="topleft" + left="0" + name="2_days_ago" + top="0" + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="3_days_ago" title="3 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -66,20 +74,16 @@ left="0" name="3_days_ago" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="4_days_ago" title="4 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -87,20 +91,16 @@ left="0" name="4_days_ago" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" name="5_days_ago" title="5 days ago"> - <scroll_list + <flat_list_view draw_heading="false" follows="all" height="150" @@ -108,55 +108,59 @@ left="0" name="5_days_ago_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> <accordion_tab can_resize="false" layout="topleft" - min_height="100" - name="6_days_ago" - title="6 days ago"> - <scroll_list + name="6_days_and_older" + title="6 days and older"> + <flat_list_view draw_heading="false" follows="all" height="150" layout="topleft" left="0" - name="6_days_ago" + name="6_days_and_older_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> - + <accordion_tab can_resize="false" layout="topleft" - min_height="100" - name="older_than_6_days" - title="Older than 6 days"> - <scroll_list + name="1_month_and_older" + title="1 month and older"> + <flat_list_view draw_heading="false" follows="all" height="150" layout="topleft" left="0" - name="older_than_6_days_items" + name="1_month_and_older_items" top="0" - width="285"> - <column name="landmark_icon" width="20" /> - <column dynamic_width="true" label="Region" name="region" /> - <column name="index" width="0" /> - </scroll_list> + width="380"> + </flat_list_view> </accordion_tab> - + + <accordion_tab + can_resize="false" + layout="topleft" + name="6_months_and_older" + title="6 months and older"> + <flat_list_view + draw_heading="false" + follows="all" + height="150" + layout="topleft" + left="0" + name="6_months_and_older_items" + top="0" + width="380"> + </flat_list_view> + </accordion_tab> </accordion> - </panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml new file mode 100644 index 0000000000..bb37f43220 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="top|right|left" + height="20" + layout="topleft" + left="0" + name="teleport_history_item" + top="0" + width="380"> + <icon + follows="top|right|left" + height="20" + image_name="ListItem_Over" + layout="topleft" + left="0" + name="hovered_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="selected_icon" + top="0" + visible="false" + width="380" /> + <icon + height="20" + follows="top|right|left" + image_name="ListItem_Select" + layout="topleft" + left="0" + name="landmark_icon" + top="0" + visible="false" + width="20" /> + <text + follows="left|right" + height="20" + layout="topleft" + left_pad="5" + name="region" + text_color="white" + top="4" + value="Unknown" + width="380" /> + <button + follows="right" + height="18" + image_disabled="Info" + image_disabled_selected="Info" + image_hover_selected="Info" + image_selected="Info" + image_unselected="Info" + layout="topleft" + name="info_btn" + picture_style="true" + visible="false" + right="-5" + top="2" + width="18" /> +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2eb9ba6d07..13a53a4ce3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1819,7 +1819,7 @@ this texture in your inventory <string name="AnimFlagStart" value=" Start Animation : " /> <string name="Wave" value=" Wave " /> <string name="HelloAvatar" value=" Hello, avatar! " /> - <string name="ViewAllGestures" value=" View All >>" /> + <string name="ViewAllGestures" value=" View All >>" /> <!-- inventory filter --> <!-- use value="" because they have preceding spaces --> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index eabacbecb2..df5ea24c73 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<accordion_tab - header_collapse_img="accordion_collapsed.tga" - header_collapse_img_pressed="accordion_collapsed.tga" - header_expand_img="accordion_expanded.tga" - header_expand_img_pressed="accordion_expanded.tga" /> +<accordion_tab + header_collapse_img="Accordion_ArrowClosed_Off" + header_collapse_img_pressed="Accordion_ArrowClosed_Press" + header_expand_img="Accordion_ArrowOpened_Off" + header_expand_img_pressed="Accordion_ArrowOpened_Press" /> diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml new file mode 100644 index 0000000000..bcfc2f6472 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<expandable_text + max_height="300" > + <textbox + follows="left|top" + name="text" + use_ellipses="true" + word_wrap="true" + tab_stop="true" + v_pad="2" + h_pad="3" > + <expand_textbox + name="expand" + follows="bottom|right" + visible="false" + bg_visible="false" + tab_stop="false" + v_pad="0" + h_pad="0" + text="[http://www.DUMMY.com More]" + tool_tip="Click to expand text"/> + </textbox> + <scroll + name="scroll" + follows="all" + /> +</expandable_text>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index ada258fbec..ec8395a7c5 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -2,16 +2,16 @@ <filter_editor clear_button_visible="true" search_button_visible="true" - text_pad_left="4" + text_pad_left="5" select_on_focus="true" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" - background_image_focused="TextField_Search_Active" > + background_image_focused="TextField_Search_Active"> <search_button label="" top_pad="4" - left_pad="4" + left_pad="4" width="13" - height="13" + height="13" image_unselected="Search" image_selected="Search" /> <clear_button label="" diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml index 24d072a573..8078579806 100644 --- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml +++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <flat_list_view allow_select="true" - item_pad="5" + color="DkGray2" + item_pad="0" keep_one_selected="true" multi_select="false" opaque="true" />
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml deleted file mode 100644 index 4a59716464..0000000000 --- a/indra/newview/skins/default/xui/en/widgets/list.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<list - allow_select="true" - bg_opaque_color="PanelFocusBackgroundColor" - bg_alpha_color="PanelDefaultBackgroundColor" - background_visible="false" - background_opaque="false" - item_pad="5" - keep_one_selected="true" - multi_select="false" />
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index a37ed76c51..df8a9431d7 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -44,7 +44,8 @@ label="" pad_right="0" tool_tip="My Location History"/> - <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"/> + <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10" + scroll_bar_bg_visible="true" /> <combo_editor name="Combo Text Entry" text_pad_left="20" select_on_focus="false" diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml index e3a53eee4d..cb876da8d8 100644 --- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml +++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml @@ -10,7 +10,9 @@ highlighted_color="ScrollHighlightedColor" column_padding="5" draw_stripes="true" - background_visible="true" - heading_height="20" - draw_border="true" - draw_heading="false"/> + background_visible="false" + heading_height="23" + draw_border="false" + draw_heading="false" + scroll_bar_bg_visible="false" + scroll_bar_bg_color="black" /> diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml index 3e0f6513cc..071d505569 100644 --- a/indra/newview/skins/default/xui/es/floater_about.xml +++ b/indra/newview/skins/default/xui/es/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="Acerca de [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Le ofrecen Second Life 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, y otros muchos. Gracias a todos estos residentes por contribuir a garantizar que esta es la mejor versión: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + + Para tener éxito en los negocios, se atrevido, se el primero, se diferente. (Henry Marchant) + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -26,10 +35,9 @@ All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - - Para tener éxito en los negocios, se atrevido, se el primero, se diferente. (Henry Marchant) </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Está en [POSITION] </string> diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml index c167221b73..eee9caf830 100644 --- a/indra/newview/skins/default/xui/es/floater_map.xml +++ b/indra/newview/skins/default/xui/es/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- E
- </floater.string>
- <floater.string name="mini_map_west">
- O
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SE
- </floater.string>
- <floater.string name="mini_map_northeast">
- NE
- </floater.string>
- <floater.string name="mini_map_southwest">
- SO
- </floater.string>
- <floater.string name="mini_map_northwest">
- NO
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NW" name="floater_map_northwest" text="NO">
- NO
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + E + </floater.string> + <floater.string name="mini_map_west"> + O + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SE + </floater.string> + <floater.string name="mini_map_northeast"> + NE + </floater.string> + <floater.string name="mini_map_southwest"> + SO + </floater.string> + <floater.string name="mini_map_northwest"> + NO + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NW" name="floater_map_northwest" text="NO"> + NO + </text> +</floater> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml index 2718ead861..02fb4da017 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="ancho / alto">
- Proporción:
- </text>
- <combo_box name="aspect_ratio" tool_tip="ancho / alto">
- <combo_box.item label="4:3 (Standard CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Widescreen)" name="item3"/>
- <combo_box.item label="16:9 (Widescreen)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="ancho / alto"> + Proporción: + </text> + <combo_box name="aspect_ratio" tool_tip="ancho / alto"> + <combo_box.item label="4:3 (Standard CRT)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Widescreen)" name="item3"/> + <combo_box.item label="16:9 (Widescreen)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml index 93d0ea8fe3..7cb4009422 100644 --- a/indra/newview/skins/default/xui/es/panel_world_map.xml +++ b/indra/newview/skins/default/xui/es/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- E
- </panel.string>
- <panel.string name="world_map_west">
- O
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SO
- </panel.string>
- <panel.string name="world_map_northwest">
- NO
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NW" name="floater_map_northwest" text="NO">
- NO
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + E + </panel.string> + <panel.string name="world_map_west"> + O + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SE + </panel.string> + <panel.string name="world_map_northeast"> + NE + </panel.string> + <panel.string name="world_map_southwest"> + SO + </panel.string> + <panel.string name="world_map_northwest"> + NO + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NW" name="floater_map_northwest" text="NO"> + NO + </text> +</panel> diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml index e05a6d1596..7b918be075 100644 --- a/indra/newview/skins/default/xui/fr/floater_about.xml +++ b/indra/newview/skins/default/xui/fr/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="A propos de [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life existe grâce aux efforts de 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 et de nombreuses autres personnes. Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu'à présent) : able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + + Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -25,10 +34,9 @@ Tous droits réservés. Voir licenses.txt pour plus de détails. Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - - Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Votre position : [POSITION] </string> diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml index 20bd9e60b4..ec4bd4ef4a 100644 --- a/indra/newview/skins/default/xui/fr/floater_map.xml +++ b/indra/newview/skins/default/xui/fr/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- E
- </floater.string>
- <floater.string name="mini_map_west">
- O
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SE
- </floater.string>
- <floater.string name="mini_map_northeast">
- NE
- </floater.string>
- <floater.string name="mini_map_southwest">
- SO
- </floater.string>
- <floater.string name="mini_map_northwest">
- NO
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + E + </floater.string> + <floater.string name="mini_map_west"> + O + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SE + </floater.string> + <floater.string name="mini_map_northeast"> + NE + </floater.string> + <floater.string name="mini_map_southwest"> + SO + </floater.string> + <floater.string name="mini_map_northwest"> + NO + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</floater> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml index 89b4096de7..4f0f6a8a23 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
- Rapport hauteur/largeur :
- </text>
- <combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
- <combo_box.item label="4:3 (Standard CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280 x 1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (écran large)" name="item3"/>
- <combo_box.item label="16:9 (plein écran)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="largeur/hauteur"> + Rapport hauteur/largeur : + </text> + <combo_box name="aspect_ratio" tool_tip="largeur/hauteur"> + <combo_box.item label="4:3 (Standard CRT)" name="item1"/> + <combo_box.item label="5:4 (1280 x 1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (écran large)" name="item3"/> + <combo_box.item label="16:9 (plein écran)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml index 4d4f94273b..d00157a297 100644 --- a/indra/newview/skins/default/xui/fr/panel_world_map.xml +++ b/indra/newview/skins/default/xui/fr/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- E
- </panel.string>
- <panel.string name="world_map_west">
- O
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SO
- </panel.string>
- <panel.string name="world_map_northwest">
- NO
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + E + </panel.string> + <panel.string name="world_map_west"> + O + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SE + </panel.string> + <panel.string name="world_map_northeast"> + NE + </panel.string> + <panel.string name="world_map_southwest"> + SO + </panel.string> + <panel.string name="world_map_northwest"> + NO + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</panel> diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml index 597208eedb..2c91375930 100644 --- a/indra/newview/skins/default/xui/it/floater_about.xml +++ b/indra/newview/skins/default/xui/it/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="Informazioni su [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life è offerto da 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. Si ringraziano i seguenti residenti per aver contribuito a rendere questa versione la migliore possibile: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + + Per avere successo nel business, sii coraggioso, sii il primo, sii differente. --Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -26,10 +35,9 @@ Tutti i diritti riservati. Leggi licenses.txt per maggiori dettagli. Chat vocale Codifica audio: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - - Per avere successo nel business, sii coraggioso, sii il primo, sii differente. --Henry Marchant </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Sei a [POSITION] </string> diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml index 20bd9e60b4..ec4bd4ef4a 100644 --- a/indra/newview/skins/default/xui/it/floater_map.xml +++ b/indra/newview/skins/default/xui/it/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- E
- </floater.string>
- <floater.string name="mini_map_west">
- O
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SE
- </floater.string>
- <floater.string name="mini_map_northeast">
- NE
- </floater.string>
- <floater.string name="mini_map_southwest">
- SO
- </floater.string>
- <floater.string name="mini_map_northwest">
- NO
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + E + </floater.string> + <floater.string name="mini_map_west"> + O + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SE + </floater.string> + <floater.string name="mini_map_northeast"> + NE + </floater.string> + <floater.string name="mini_map_southwest"> + SO + </floater.string> + <floater.string name="mini_map_northwest"> + NO + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</floater> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml index cf1e22997a..2355dc7f0a 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="larghezza/altezza">
- Rapporto di visualizzazione:
- </text>
- <combo_box name="aspect_ratio" tool_tip="larghezza/altezza">
- <combo_box.item label="4:3 (Monitor Standard)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Widescreen)" name="item3"/>
- <combo_box.item label="16:9 (Widescreen)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="larghezza/altezza"> + Rapporto di visualizzazione: + </text> + <combo_box name="aspect_ratio" tool_tip="larghezza/altezza"> + <combo_box.item label="4:3 (Monitor Standard)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Widescreen)" name="item3"/> + <combo_box.item label="16:9 (Widescreen)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml index 4d4f94273b..d00157a297 100644 --- a/indra/newview/skins/default/xui/it/panel_world_map.xml +++ b/indra/newview/skins/default/xui/it/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- E
- </panel.string>
- <panel.string name="world_map_west">
- O
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SO
- </panel.string>
- <panel.string name="world_map_northwest">
- NO
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + E + </panel.string> + <panel.string name="world_map_west"> + O + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SE + </panel.string> + <panel.string name="world_map_northeast"> + NE + </panel.string> + <panel.string name="world_map_southwest"> + SO + </panel.string> + <panel.string name="world_map_northwest"> + NO + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</panel> diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml index fb12e48c9a..a9b3d81a3b 100644 --- a/indra/newview/skins/default/xui/ja/floater_about.xml +++ b/indra/newview/skins/default/xui/ja/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="floater_about" title="[APP_NAME]について"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Lifeは、 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と、その他多数の人達によって作成されました。 このバージョンをこれまでで最高のものになるようご協力をいただいた以下の住人の皆様に深く感謝いたします。 able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + + ビジネスで成功するには、勇気を持って、誰よりも先に、人と違ったことをすることだ。 --Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -25,10 +34,9 @@ 無断転写、複製、転載を禁じます。 詳細はlicenses.txtを参照してください。 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - - ビジネスで成功するには、勇気を持って、誰よりも先に、人と違ったことをすることだ。 --Henry Marchant </text_editor> + </panel> +</tab_container> <text name="you_are_at"> [POSITION] </text> diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml index 3884333c91..3356d4948a 100644 --- a/indra/newview/skins/default/xui/ja/floater_map.xml +++ b/indra/newview/skins/default/xui/ja/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- 北
- </floater.string>
- <floater.string name="mini_map_east">
- 東
- </floater.string>
- <floater.string name="mini_map_west">
- 西
- </floater.string>
- <floater.string name="mini_map_south">
- 南
- </floater.string>
- <floater.string name="mini_map_southeast">
- 南東
- </floater.string>
- <floater.string name="mini_map_northeast">
- 北東
- </floater.string>
- <floater.string name="mini_map_southwest">
- 南西
- </floater.string>
- <floater.string name="mini_map_northwest">
- 北西
- </floater.string>
- <text label="北" name="floater_map_north" text="北">
- 北
- </text>
- <text label="東" name="floater_map_east" text="東">
- 東
- </text>
- <text label="西" name="floater_map_west" text="西">
- 西
- </text>
- <text label="南" name="floater_map_south" text="南">
- 南
- </text>
- <text label="南東" name="floater_map_southeast" text="南東">
- 南東
- </text>
- <text label="北東" name="floater_map_northeast" text="北東">
- 北東
- </text>
- <text label="南西" name="floater_map_southwest" text="南西">
- 南西
- </text>
- <text label="北西" name="floater_map_northwest" text="北西">
- 北西
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + 北 + </floater.string> + <floater.string name="mini_map_east"> + 東 + </floater.string> + <floater.string name="mini_map_west"> + 西 + </floater.string> + <floater.string name="mini_map_south"> + 南 + </floater.string> + <floater.string name="mini_map_southeast"> + 南東 + </floater.string> + <floater.string name="mini_map_northeast"> + 北東 + </floater.string> + <floater.string name="mini_map_southwest"> + 南西 + </floater.string> + <floater.string name="mini_map_northwest"> + 北西 + </floater.string> + <text label="北" name="floater_map_north" text="北"> + 北 + </text> + <text label="東" name="floater_map_east" text="東"> + 東 + </text> + <text label="西" name="floater_map_west" text="西"> + 西 + </text> + <text label="南" name="floater_map_south" text="南"> + 南 + </text> + <text label="南東" name="floater_map_southeast" text="南東"> + 南東 + </text> + <text label="北東" name="floater_map_northeast" text="北東"> + 北東 + </text> + <text label="南西" name="floater_map_southwest" text="南西"> + 南西 + </text> + <text label="北西" name="floater_map_northwest" text="北西"> + 北西 + </text> +</floater> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml index 4b6f1f061b..0665dd4590 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="（幅/高さ）">
- 縦横比：
- </text>
- <combo_box name="aspect_ratio" tool_tip="（幅/高さ）">
- <combo_box.item label="4：3（標準CRT）" name="item1"/>
- <combo_box.item label="5：4（1280x1024 LCD）" name="item2"/>
- <combo_box.item label="8：5（ワイドスクリ－ン）" name="item3"/>
- <combo_box.item label="16：9（ワイドスクリ－ン）" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="（幅/高さ）"> + 縦横比： + </text> + <combo_box name="aspect_ratio" tool_tip="（幅/高さ）"> + <combo_box.item label="4：3（標準CRT）" name="item1"/> + <combo_box.item label="5：4（1280x1024 LCD）" name="item2"/> + <combo_box.item label="8：5（ワイドスクリ－ン）" name="item3"/> + <combo_box.item label="16：9（ワイドスクリ－ン）" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml index 22b9471533..391379b072 100644 --- a/indra/newview/skins/default/xui/ja/panel_world_map.xml +++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- 北
- </panel.string>
- <panel.string name="world_map_east">
- 東
- </panel.string>
- <panel.string name="world_map_west">
- 西
- </panel.string>
- <panel.string name="world_map_south">
- 南
- </panel.string>
- <panel.string name="world_map_southeast">
- 南東
- </panel.string>
- <panel.string name="world_map_northeast">
- 北東
- </panel.string>
- <panel.string name="world_map_southwest">
- 南西
- </panel.string>
- <panel.string name="world_map_northwest">
- 北西
- </panel.string>
- <text label="北" name="floater_map_north" text="北">
- 北
- </text>
- <text label="東" name="floater_map_east" text="東">
- 東
- </text>
- <text label="西" name="floater_map_west" text="西">
- 西
- </text>
- <text label="南" name="floater_map_south" text="南">
- 南
- </text>
- <text label="南東" name="floater_map_southeast" text="南東">
- 南東
- </text>
- <text label="北東" name="floater_map_northeast" text="北東">
- 北東
- </text>
- <text label="南西" name="floater_map_southwest" text="南西">
- 南西
- </text>
- <text label="北西" name="floater_map_northwest" text="北西">
- 北西
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + 北 + </panel.string> + <panel.string name="world_map_east"> + 東 + </panel.string> + <panel.string name="world_map_west"> + 西 + </panel.string> + <panel.string name="world_map_south"> + 南 + </panel.string> + <panel.string name="world_map_southeast"> + 南東 + </panel.string> + <panel.string name="world_map_northeast"> + 北東 + </panel.string> + <panel.string name="world_map_southwest"> + 南西 + </panel.string> + <panel.string name="world_map_northwest"> + 北西 + </panel.string> + <text label="北" name="floater_map_north" text="北"> + 北 + </text> + <text label="東" name="floater_map_east" text="東"> + 東 + </text> + <text label="西" name="floater_map_west" text="西"> + 西 + </text> + <text label="南" name="floater_map_south" text="南"> + 南 + </text> + <text label="南東" name="floater_map_southeast" text="南東"> + 南東 + </text> + <text label="北東" name="floater_map_northeast" text="北東"> + 北東 + </text> + <text label="南西" name="floater_map_southwest" text="南西"> + 南西 + </text> + <text label="北西" name="floater_map_northwest" text="北西"> + 北西 + </text> +</panel> diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml index 4d5d8b1032..9ad947df66 100644 --- a/indra/newview/skins/default/xui/nl/floater_about.xml +++ b/indra/newview/skins/default/xui/nl/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="Over [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life wordt u aangeboden door 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. Een 'Dank u' voor de volgende bewoners voor het helpen zorgdragen dat dit de beste versie tot nu toe is: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + +To be a success in business, be daring, be first, be different. --Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -26,9 +35,9 @@ google-perftools Copyright (c) 2005, Google Inc. All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - -To be a success in business, be daring, be first, be different. --Henry Marchant </text_editor> + </panel> +</tab_container> <string name="you_are_at"> U bent op [POSITION] </string> diff --git a/indra/newview/skins/default/xui/nl/floater_map.xml b/indra/newview/skins/default/xui/nl/floater_map.xml index 4bd691a96a..29af36e50c 100644 --- a/indra/newview/skins/default/xui/nl/floater_map.xml +++ b/indra/newview/skins/default/xui/nl/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- O
- </floater.string>
- <floater.string name="mini_map_west">
- W
- </floater.string>
- <floater.string name="mini_map_south">
- Z
- </floater.string>
- <floater.string name="mini_map_southeast">
- ZO
- </floater.string>
- <floater.string name="mini_map_northeast">
- NO
- </floater.string>
- <floater.string name="mini_map_southwest">
- ZW
- </floater.string>
- <floater.string name="mini_map_northwest">
- NW
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="O" name="floater_map_east" text="O">
- O
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="Z" name="floater_map_south" text="Z">
- Z
- </text>
- <text label="ZO" name="floater_map_southeast" text="ZO">
- ZO
- </text>
- <text label="NO" name="floater_map_northeast" text="NO">
- NO
- </text>
- <text label="ZW" name="floater_map_southwest" text="ZW">
- ZW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + O + </floater.string> + <floater.string name="mini_map_west"> + W + </floater.string> + <floater.string name="mini_map_south"> + Z + </floater.string> + <floater.string name="mini_map_southeast"> + ZO + </floater.string> + <floater.string name="mini_map_northeast"> + NO + </floater.string> + <floater.string name="mini_map_southwest"> + ZW + </floater.string> + <floater.string name="mini_map_northwest"> + NW + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="O" name="floater_map_east" text="O"> + O + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="Z" name="floater_map_south" text="Z"> + Z + </text> + <text label="ZO" name="floater_map_southeast" text="ZO"> + ZO + </text> + <text label="NO" name="floater_map_northeast" text="NO"> + NO + </text> + <text label="ZW" name="floater_map_southwest" text="ZW"> + ZW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</floater> diff --git a/indra/newview/skins/default/xui/nl/panel_world_map.xml b/indra/newview/skins/default/xui/nl/panel_world_map.xml index 4df1ec10d8..11855b7fc1 100644 --- a/indra/newview/skins/default/xui/nl/panel_world_map.xml +++ b/indra/newview/skins/default/xui/nl/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- O
- </panel.string>
- <panel.string name="world_map_west">
- W
- </panel.string>
- <panel.string name="world_map_south">
- Z
- </panel.string>
- <panel.string name="world_map_southeast">
- ZO
- </panel.string>
- <panel.string name="world_map_northeast">
- NO
- </panel.string>
- <panel.string name="world_map_southwest">
- ZW
- </panel.string>
- <panel.string name="world_map_northwest">
- NW
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="O" name="floater_map_east" text="O">
- O
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="Z" name="floater_map_south" text="Z">
- Z
- </text>
- <text label="ZO" name="floater_map_southeast" text="ZO">
- ZO
- </text>
- <text label="NO" name="floater_map_northeast" text="NO">
- NO
- </text>
- <text label="ZW" name="floater_map_southwest" text="ZW">
- ZW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + O + </panel.string> + <panel.string name="world_map_west"> + W + </panel.string> + <panel.string name="world_map_south"> + Z + </panel.string> + <panel.string name="world_map_southeast"> + ZO + </panel.string> + <panel.string name="world_map_northeast"> + NO + </panel.string> + <panel.string name="world_map_southwest"> + ZW + </panel.string> + <panel.string name="world_map_northwest"> + NW + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="O" name="floater_map_east" text="O"> + O + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="Z" name="floater_map_south" text="Z"> + Z + </text> + <text label="ZO" name="floater_map_southeast" text="ZO"> + ZO + </text> + <text label="NO" name="floater_map_northeast" text="NO"> + NO + </text> + <text label="ZW" name="floater_map_southwest" text="ZW"> + ZW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</panel> diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml index bbf8165883..0f100b9d83 100755 --- a/indra/newview/skins/default/xui/pl/floater_about.xml +++ b/indra/newview/skins/default/xui/pl/floater_about.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="floater_about" title="O [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life zostało stworzone dla Was przez: 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 i wielu innych. Podziękowania dla następujących rezydentów za pomoc w pracy nad obecną wersją Second Life: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + + I get by with a little help from my friends. --Richard Starkey + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -25,11 +34,9 @@ Wszystkie prawa zastrzeżone. Szczegóły w pliku licenses.txt. Programowanie dźwięku czatu: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - Polska wersja klienta: Malwina Dollinger, Magnus Balczo, Identity Euler - - I get by with a little help from my friends. --Richard Starkey </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Położenie: [POSITION] </string> diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml index 361f8f4f49..6eabde7c52 100644 --- a/indra/newview/skins/default/xui/pl/floater_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- E
- </floater.string>
- <floater.string name="mini_map_west">
- W
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SE
- </floater.string>
- <floater.string name="mini_map_northeast">
- NE
- </floater.string>
- <floater.string name="mini_map_southwest">
- SW
- </floater.string>
- <floater.string name="mini_map_northwest">
- NW
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + E + </floater.string> + <floater.string name="mini_map_west"> + W + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SE + </floater.string> + <floater.string name="mini_map_northeast"> + NE + </floater.string> + <floater.string name="mini_map_southwest"> + SW + </floater.string> + <floater.string name="mini_map_northwest"> + NW + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SW" name="floater_map_southwest" text="SW"> + SW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</floater> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml index 75a9efcd0a..2b70a728fa 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="width / height">
- Proporcje:
- </text>
- <combo_box name="aspect_ratio" tool_tip="width / height">
- <combo_box.item label="4:3 (Standardowy CRT)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (Panoramiczny)" name="item3"/>
- <combo_box.item label="16:9 (Panoramiczny)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="width / height"> + Proporcje: + </text> + <combo_box name="aspect_ratio" tool_tip="width / height"> + <combo_box.item label="4:3 (Standardowy CRT)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (Panoramiczny)" name="item3"/> + <combo_box.item label="16:9 (Panoramiczny)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml index babb9fbae1..608f102dc9 100644 --- a/indra/newview/skins/default/xui/pl/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- E
- </panel.string>
- <panel.string name="world_map_west">
- W
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SW
- </panel.string>
- <panel.string name="world_map_northwest">
- NW
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="E" name="floater_map_east" text="E">
- E
- </text>
- <text label="W" name="floater_map_west" text="W">
- W
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SW" name="floater_map_southwest" text="SW">
- SW
- </text>
- <text label="NW" name="floater_map_northwest" text="NW">
- NW
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + E + </panel.string> + <panel.string name="world_map_west"> + W + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SE + </panel.string> + <panel.string name="world_map_northeast"> + NE + </panel.string> + <panel.string name="world_map_southwest"> + SW + </panel.string> + <panel.string name="world_map_northwest"> + NW + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="E" name="floater_map_east" text="E"> + E + </text> + <text label="W" name="floater_map_west" text="W"> + W + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SW" name="floater_map_southwest" text="SW"> + SW + </text> + <text label="NW" name="floater_map_northwest" text="NW"> + NW + </text> +</panel> diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index c8c0442d1d..12cc879cbc 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_about" title="Sobre o [APP_NAME]"> +<tab_container name="about_tab"> + <panel name="credits_panel"> <text_editor name="credits_editor"> Second Life é oferecido a você por 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 e muitos outros. Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 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, 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 + + Para ter sucesso nos negócios, seja ousado, seja o primeiro, seja diferente. --Henry Marchant + </text_editor> + </panel> + <panel name="licenses_panel"> + <text_editor name="credits_editor"> 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) @@ -26,10 +34,9 @@ Todos os direitos reservados. Veja licenças.txt para detalhes. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) - - - Para ter sucesso nos negócios, seja ousado, seja o primeiro, seja diferente. --Henry Marchant </text_editor> + </panel> +</tab_container> <string name="you_are_at"> Você está em [POSITION] </string> diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml index eb55560a1e..ff60f77c4b 100644 --- a/indra/newview/skins/default/xui/pt/floater_map.xml +++ b/indra/newview/skins/default/xui/pt/floater_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map">
- <floater.string name="mini_map_north">
- N
- </floater.string>
- <floater.string name="mini_map_east">
- L
- </floater.string>
- <floater.string name="mini_map_west">
- O
- </floater.string>
- <floater.string name="mini_map_south">
- S
- </floater.string>
- <floater.string name="mini_map_southeast">
- SE
- </floater.string>
- <floater.string name="mini_map_northeast">
- NE
- </floater.string>
- <floater.string name="mini_map_southwest">
- SO
- </floater.string>
- <floater.string name="mini_map_northwest">
- NO
- </floater.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="L" name="floater_map_east" text="L">
- L
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater name="Map"> + <floater.string name="mini_map_north"> + N + </floater.string> + <floater.string name="mini_map_east"> + L + </floater.string> + <floater.string name="mini_map_west"> + O + </floater.string> + <floater.string name="mini_map_south"> + S + </floater.string> + <floater.string name="mini_map_southeast"> + SE + </floater.string> + <floater.string name="mini_map_northeast"> + NE + </floater.string> + <floater.string name="mini_map_southwest"> + SO + </floater.string> + <floater.string name="mini_map_northwest"> + NO + </floater.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="L" name="floater_map_east" text="L"> + L + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</floater> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index b53fe51509..5ca80bd74d 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -1,12 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?>
-<panel name="advanced">
- <text name="AspectRatioLabel1" tool_tip="largura / altura">
- Relação de Aspecto:
- </text>
- <combo_box name="aspect_ratio" tool_tip="largura / altura">
- <combo_box.item label="4:3 (CRT Padrão)" name="item1"/>
- <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/>
- <combo_box.item label="8:5 (tela ampla)" name="item3"/>
- <combo_box.item label="16:9 (tela ampla)" name="item4"/>
- </combo_box>
-</panel>
+<?xml version="1.0" encoding="utf-8"?> +<panel name="advanced"> + <text name="AspectRatioLabel1" tool_tip="largura / altura"> + Relação de Aspecto: + </text> + <combo_box name="aspect_ratio" tool_tip="largura / altura"> + <combo_box.item label="4:3 (CRT Padrão)" name="item1"/> + <combo_box.item label="5:4 (1280x1024 LCD)" name="item2"/> + <combo_box.item label="8:5 (tela ampla)" name="item3"/> + <combo_box.item label="16:9 (tela ampla)" name="item4"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml index ed63b1eb0d..2fda713ec7 100644 --- a/indra/newview/skins/default/xui/pt/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pt/panel_world_map.xml @@ -1,51 +1,51 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="world_map">
- <panel.string name="world_map_north">
- N
- </panel.string>
- <panel.string name="world_map_east">
- L
- </panel.string>
- <panel.string name="world_map_west">
- O
- </panel.string>
- <panel.string name="world_map_south">
- S
- </panel.string>
- <panel.string name="world_map_southeast">
- SE
- </panel.string>
- <panel.string name="world_map_northeast">
- NE
- </panel.string>
- <panel.string name="world_map_southwest">
- SO
- </panel.string>
- <panel.string name="world_map_northwest">
- NO
- </panel.string>
- <text label="N" name="floater_map_north" text="N">
- N
- </text>
- <text label="L" name="floater_map_east" text="L">
- L
- </text>
- <text label="O" name="floater_map_west" text="O">
- O
- </text>
- <text label="S" name="floater_map_south" text="S">
- S
- </text>
- <text label="SE" name="floater_map_southeast" text="SE">
- SE
- </text>
- <text label="NE" name="floater_map_northeast" text="NE">
- NE
- </text>
- <text label="SO" name="floater_map_southwest" text="SO">
- SO
- </text>
- <text label="NO" name="floater_map_northwest" text="NO">
- NO
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="world_map"> + <panel.string name="world_map_north"> + N + </panel.string> + <panel.string name="world_map_east"> + L + </panel.string> + <panel.string name="world_map_west"> + O + </panel.string> + <panel.string name="world_map_south"> + S + </panel.string> + <panel.string name="world_map_southeast"> + SE + </panel.string> + <panel.string name="world_map_northeast"> + NE + </panel.string> + <panel.string name="world_map_southwest"> + SO + </panel.string> + <panel.string name="world_map_northwest"> + NO + </panel.string> + <text label="N" name="floater_map_north" text="N"> + N + </text> + <text label="L" name="floater_map_east" text="L"> + L + </text> + <text label="O" name="floater_map_west" text="O"> + O + </text> + <text label="S" name="floater_map_south" text="S"> + S + </text> + <text label="SE" name="floater_map_southeast" text="SE"> + SE + </text> + <text label="NE" name="floater_map_northeast" text="NE"> + NE + </text> + <text label="SO" name="floater_map_southwest" text="SO"> + SO + </text> + <text label="NO" name="floater_map_northwest" text="NO"> + NO + </text> +</panel> |
