From cc92525b0df952659102d2e5adcc4140fea7f371 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 4 May 2009 17:43:26 +0000 Subject: QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql --- .../newview/skins/default/xui/pt/floater_about.xml | 30 + .../skins/default/xui/pt/floater_about_land.xml | 133 +- .../default/xui/pt/floater_animation_preview.xml | 17 +- .../skins/default/xui/pt/floater_auction.xml | 18 +- .../skins/default/xui/pt/floater_avatar_picker.xml | 6 +- .../default/xui/pt/floater_avatar_textures.xml | 2 +- .../skins/default/xui/pt/floater_beacons.xml | 4 +- .../newview/skins/default/xui/pt/floater_bumps.xml | 4 +- .../skins/default/xui/pt/floater_buy_currency.xml | 14 +- .../skins/default/xui/pt/floater_buy_land.xml | 60 +- .../skins/default/xui/pt/floater_buy_object.xml | 2 +- .../skins/default/xui/pt/floater_color_picker.xml | 16 +- .../skins/default/xui/pt/floater_critical.xml | 11 +- .../skins/default/xui/pt/floater_customize.xml | 50 +- .../default/xui/pt/floater_day_cycle_options.xml | 14 +- .../default/xui/pt/floater_device_settings.xml | 2 + .../skins/default/xui/pt/floater_gesture.xml | 11 +- .../skins/default/xui/pt/floater_god_tools.xml | 120 +- indra/newview/skins/default/xui/pt/floater_im.xml | 8 +- .../skins/default/xui/pt/floater_image_preview.xml | 4 +- .../skins/default/xui/pt/floater_inspect.xml | 19 +- .../skins/default/xui/pt/floater_inventory.xml | 4 +- .../xui/pt/floater_inventory_item_properties.xml | 6 +- .../xui/pt/floater_inventory_view_finder.xml | 44 +- .../skins/default/xui/pt/floater_joystick.xml | 1 - .../skins/default/xui/pt/floater_lagmeter.xml | 4 +- .../skins/default/xui/pt/floater_land_holdings.xml | 17 +- .../skins/default/xui/pt/floater_media_browser.xml | 12 +- .../skins/default/xui/pt/floater_moveview.xml | 20 +- .../skins/default/xui/pt/floater_my_friends.xml | 7 + .../skins/default/xui/pt/floater_openobject.xml | 10 +- .../skins/default/xui/pt/floater_post_process.xml | 53 + .../skins/default/xui/pt/floater_postcard.xml | 2 +- .../skins/default/xui/pt/floater_preferences.xml | 12 +- .../default/xui/pt/floater_preview_animation.xml | 10 +- .../default/xui/pt/floater_preview_classified.xml | 2 +- .../skins/default/xui/pt/floater_preview_event.xml | 2 +- .../default/xui/pt/floater_preview_gesture.xml | 16 +- .../skins/default/xui/pt/floater_preview_sound.xml | 12 +- .../skins/default/xui/pt/floater_report_abuse.xml | 31 +- .../skins/default/xui/pt/floater_script_debug.xml | 6 +- .../skins/default/xui/pt/floater_script_queue.xml | 6 +- .../skins/default/xui/pt/floater_script_search.xml | 16 +- .../skins/default/xui/pt/floater_select_key.xml | 7 + .../skins/default/xui/pt/floater_sell_land.xml | 20 +- .../default/xui/pt/floater_settings_debug.xml | 18 +- .../skins/default/xui/pt/floater_snapshot.xml | 12 +- .../skins/default/xui/pt/floater_sound_preview.xml | 23 +- .../skins/default/xui/pt/floater_telehub.xml | 15 +- .../skins/default/xui/pt/floater_texture_ctrl.xml | 1 - .../newview/skins/default/xui/pt/floater_tools.xml | 72 +- .../skins/default/xui/pt/floater_top_objects.xml | 12 +- indra/newview/skins/default/xui/pt/floater_tos.xml | 2 +- .../skins/default/xui/pt/floater_url_entry.xml | 2 +- .../default/xui/pt/floater_wearable_save_as.xml | 10 +- .../skins/default/xui/pt/floater_world_map.xml | 65 +- .../skins/default/xui/pt/menu_inventory.xml | 116 +- indra/newview/skins/default/xui/pt/menu_viewer.xml | 66 +- .../newview/skins/default/xui/pt/notifications.xml | 5748 ++++++++++++++++++++ .../skins/default/xui/pt/panel_audio_device.xml | 10 + .../newview/skins/default/xui/pt/panel_friends.xml | 16 +- .../skins/default/xui/pt/panel_group_general.xml | 38 +- .../skins/default/xui/pt/panel_group_invite.xml | 8 +- .../default/xui/pt/panel_group_land_money.xml | 17 +- .../skins/default/xui/pt/panel_group_notices.xml | 47 +- .../skins/default/xui/pt/panel_group_roles.xml | 65 +- .../newview/skins/default/xui/pt/panel_groups.xml | 16 + indra/newview/skins/default/xui/pt/panel_login.xml | 4 +- .../default/xui/pt/panel_preferences_chat.xml | 15 +- .../default/xui/pt/panel_preferences_general.xml | 17 +- .../default/xui/pt/panel_preferences_graphics1.xml | 39 +- .../skins/default/xui/pt/panel_region_covenant.xml | 29 +- .../skins/default/xui/pt/panel_region_debug.xml | 18 +- .../skins/default/xui/pt/panel_region_estate.xml | 24 +- .../skins/default/xui/pt/panel_region_general.xml | 20 +- .../skins/default/xui/pt/panel_region_terrain.xml | 43 +- .../skins/default/xui/pt/panel_scrolling_param.xml | 10 +- .../skins/default/xui/pt/panel_status_bar.xml | 20 +- indra/newview/skins/default/xui/pt/strings.xml | 16 +- .../skins/default/xui/pt/teleport_strings.xml | 26 +- 80 files changed, 6647 insertions(+), 878 deletions(-) create mode 100644 indra/newview/skins/default/xui/pt/floater_device_settings.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_my_friends.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_post_process.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_select_key.xml create mode 100644 indra/newview/skins/default/xui/pt/notifications.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_groups.xml (limited to 'indra/newview/skins/default/xui/pt') diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index 10cce81115..fa0e34815d 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -1,5 +1,35 @@ + + 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 e muitos outros. + + Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: (in progress) + + 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) + DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. + expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. + FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). + GL Copyright (C) 1999-2004 Brian Paul. + Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. + jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) + jpeglib Copyright (C) 1991-1998, Thomas G. Lane. + ogg/vorbis Copyright (C) 2001, Xiphophorus + OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. + SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga + SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + xmlrpc-epi Copyright (C) 2000 Epinions, Inc. + zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. + google-perftools Copyright (c) 2005, Google Inc. + + 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) + + + Eu tive uma pequena ajuda de meus amigos. --Richard Starkey + Você está em [POSITION] diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index c61ef4b637..604b143130 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -20,30 +20,30 @@