diff --git a/doc/contributions.txt b/doc/contributions.txt
index ee56ef36653ac97c63c93a8929d8d4d9f3f3e3e9..0a1c1182f324bbc99dd6f476aaa5b6508d40a517 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1,8 +1,8 @@
-Linden Lab would like to acknowledge source code contributions from the
+Linden Lab would like to acknowledge contributions from the
following residents. The Second Life resident name is given below,
-along with the issue identifier corresponding to the patches we've
-received from them.
+along with the issue identifiers to which they have contributed.
+45ms Zhong
Able Whitman
VWR-650
VWR-1460
@@ -11,10 +11,14 @@ Able Whitman
VWR-1813
Adam Marker
VWR-2755
+Adeon Writer
+Aeonix Aeon
Agathos Frascati
CT-246
CT-317
CT-352
+Ai Austin
+Aiko Ying
Aimee Trescothick
SNOW-227
SNOW-570
@@ -154,14 +158,18 @@ Alissa Sabre
VWR-12620
VWR-12789
SNOW-322
+Alliez Mysterio
Angus Boyd
VWR-592
Ann Congrejo
CT-193
+Annie Milestone
+Annika Genezzia
Ansariel Hiller
STORM-1101
VWR-25480
VWR-26150
+Aralara Rajal
Ardy Lay
STORM-859
VWR-19499
@@ -170,16 +178,30 @@ Argent Stonecutter
VWR-68
Armin Weatherwax
VWR-8436
+ArminasX Saiman
+Arya Braveheart
+Asaeda Meltingdots
+Asturkon Jua
Asuka Neely
VWR-3434
VWR-8179
+Aura Dirval
+Avallyn Oakleaf
+Avatar Quinzet
+BabyA Littlething
+Bacchus Ireto
Balp Allen
VWR-4157
+Bazaar
Be Holder
SNOW-322
SNOW-397
+Beansy Twine
Benja Kepler
VWR-746
+Benjamin Bigdipper
+Beth Walcher
+Bezilon Kasei
Biancaluce Robbiani
CT-225
CT-226
@@ -190,6 +212,7 @@ Biancaluce Robbiani
CT-231
CT-321
CT-352
+Bill Walach
Blakar Ogre
VWR-418
VWR-881
@@ -199,6 +222,8 @@ Blakar Ogre
VWR-2164
blino Nakamura
VWR-17
+Blitzckreed Levenque
+Borg Capalini
Boroondas Gupte
OPEN-29
OPEN-39
@@ -221,6 +246,8 @@ Boroondas Gupte
VWR-24487
VWR-26066
WEB-262
+Bryn Oh
+Buckaroo Mu
Bulli Schumann
CT-218
CT-219
@@ -235,6 +262,9 @@ Bulli Schumann
bushing Spatula
VWR-119
VWR-424
+blakopal Galicia
+Callipygian Christensen
+Cap Carver
Carjay McGinnis
VWR-3737
VWR-4070
@@ -242,37 +272,64 @@ Carjay McGinnis
VWR-6154
VWR-9400
VWR-9620
+Carla Broek
+Carr Arbenlow
Catherine Pfeffer
VWR-1282
VWR-8624
VWR-10854
+Cayu Cluny
Celierra Darling
VWR-1274
VWR-6975
+Chantal Harvey
+Charles Courtois
+Charlie Sazaland
+Cherry Cheevers
+ChickyBabes Zuzu
+Christopher Organiser
+Ciaran Laval
+Clara Young
Coaldust Numbers
VWR-1095
+Colpo Wexler
+Corinne Helendale
+Corro Moseley
+Coughdrop Littlething
Cron Stardust
VWR-10579
VWR-25120
STORM-1075
Cypren Christenson
STORM-417
+Dante Tucker
Dale Glass
VWR-120
VWR-560
VWR-2502
VWR-1358
VWR-2041
+Darien Caldwell
+Dartagan Shepherd
+Debs Regent
+Decro Schmooz
+Denim Kamachi
+DiJodi Dubratt
+Dil Spitz
+Dimitrio Lewis
+Dirk
Draconis Neurocam
STORM-1259
Drew Dri
VWR-19683
+Drew Dwi
Drewan Keats
VWR-28
VWR-248
VWR-412
VWR-638
VWR-660
+Dusan Writer
Dylan Haskell
VWR-72
Dzonatas Sol
@@ -295,28 +352,51 @@ Eddy Stryker
VWR-23
VWR-1468
VWR-1475
+Edgware Marker
+Egehan Dryke
+Ellla McMahon
+Elric Anatine
+Emma Portilo
+Emmie Fairymeadow
EponymousDylan Ra
VWR-1289
VWR-1465
Eva Nowicka
CT-324
CT-352
+Eva Rau
+Evangelista Emerald
+Faelon Swordthain
Farallon Greyskin
VWR-2036
Feep Larsson
VWR-447
VWR-1314
VWR-4444
+Fiachra Lach
Flemming Congrejo
CT-193
CT-318
+Flower Ducatillon
Fluf Fredriksson
VWR-3450
Fremont Cunningham
VWR-1147
+FreeSL Aeon
+Frenchimmo Sabra
+Frontera Thor
+Fury Rosewood
+Gaberoonie Zanzibar
+Ganymedes Costagravas
+Gene Frostbite
+GeneJ Composer
Geneko Nemeth
CT-117
VWR-11069
+Gentle Heron
+Gentle Welinder
+gwampa Lomu
+Giggles Littlebird
Gigs Taggart
SVC-493
VWR-6
@@ -342,20 +422,31 @@ Gigs Taggart
VWR-8783
Ginko Bayliss
VWR-4
+Grady Echegaray
Grazer Kline
VWR-1092
VWR-2113
Gudmund Shepherd
VWR-1594
VWR-1873
+Guni Greenstein
+Gwyneth Llewelyn
+Gypsy Tripsa
+Hackshaven Harford
+Ham Rambler
Hamncheese Omlet
VWR-333
+Han Shuffle
+Hanglow Short
HappySmurf Papp
CT-193
+Harleen Gretzky
+Hatzfeld Runo
Henri Beauchamp
VWR-1320
VWR-1406
VWR-4157
+herina Bode
Hikkoshi Sakai
VWR-429
Hiro Sommambulist
@@ -368,23 +459,33 @@ Hiro Sommambulist
VWR-132
VWR-136
VWR-143
+Holger Gilruth
+Horatio Freund
Hoze Menges
VWR-255
+Hydra Shaftoe
+Hypatia Callisto
+Hypatia Pickens
Ian Kas
VWR-8780 (Russian localization)
[NO JIRA] (Ukranian localization)
CT-322
CT-325
+Identity Euler
Ima Mechanique
OPEN-50
OPEN-61
STORM-1175
+Imnotgoing Sideways
+Inma Rau
+Innula Zenovka
Irene Muni
CT-324
CT-352
Iskar Ariantho
VWR-1223
VWR-11759
+Iyoba Tarantal
Jacek Antonelli
SNOW-388
VWR-165
@@ -398,9 +499,18 @@ Jacek Antonelli
VWR-2948
VWR-3605
VWR-8617
+Jack Abraham
+Jagga Meredith
JB Kraft
VWR-5283
VWR-7802
+Jennifer Boyle
+Jeremy Marquez
+Jessica Qin
+Jinx Nordberg
+Jo Bernandes
+Jocial Sonnenkern
+Joel Savard
Joghert LeSabre
VWR-64
Jonathan Yap
@@ -454,17 +564,31 @@ Jonathan Yap
STORM-1273
STORM-1462
STORM-1459
+Jondan Lundquist
+Josef Munster
+Josette Windlow
+Juilan Tripsa
+Juro Kothari
+Justin RiversRunRed
Kage Pixel
VWR-11
+Kagehi Kohn
+Kaimen Takahe
+Keklily Longfall
+Ken Lavender
Ken March
CT-245
+Kestral Karas
Kerutsen Sellery
VWR-1350
+Khisme Nitely
Khyota Wulluf
VWR-2085
VWR-8885
VWR-9256
VWR-9966
+Kimar Coba
+Kithrak Kirkorian
Kitty Barnett
VWR-19699
STORM-288
@@ -473,6 +597,9 @@ Kitty Barnett
STORM-1001
STORM-1175
VWR-24217
+Kolor Fall
+Komiko Okamoto
+Korvel Noh
Kunnis Basiat
VWR-82
VWR-102
@@ -482,6 +609,7 @@ Latif Khalifa
VWR-5370
leliel Mirihi
STORM-1100
+len Starship
Lisa Lowe
CT-218
CT-219
@@ -493,16 +621,40 @@ Lisa Lowe
CT-319
Lockhart Cordoso
VWR-108
+LSL Scientist
+Lamorna Proctor
+Lares Carter
+Larry Pixel
+Laurent Bechir
+Leal Choche
+Lenae Munz
+Lexi Frua
+Lillie Cordeaux
+Lilly Zenovka
+Lizzy Macarthur
+Luban Yiyuan
+Luc Starsider
+Lunita Savira
+Maccus McCullough
maciek marksman
CT-86
+Madison Blanc
+Maggie Darwin
Magnus Balczo
CT-138
+Malarthi Behemoth
+Mallory Destiny
Malwina Dollinger
CT-138
+Manx Wharton
march Korda
SVC-1020
+Marc Claridge
+Marc2 Sands
+Marianne McCann
Marine Kelley
STORM-281
+Matthew Anthony
Matthew Dowd
VWR-1344
VWR-1651
@@ -510,6 +662,8 @@ Matthew Dowd
VWR-1737
VWR-1761
VWR-2681
+Matto Destiny
+Maxim RiversRunRed
McCabe Maxsted
SNOW-387
VWR-1318
@@ -523,6 +677,10 @@ McCabe Maxsted
VWR-8454
VWR-8689
VWR-9007
+Medhue Simoni
+Mel Vanbeeck
+Melinda Latynina
+Mencius Watts
Michelle2 Zenovka
STORM-477
VWR-2652
@@ -540,6 +698,12 @@ Michelle2 Zenovka
VWR-8889
VWR-8310
VWR-9499
+Michi Lumin
+Midian Farspire
+Miles Glaz
+Mindy Mathy
+Minerva Memel
+Mitch Wagner
Mm Alder
SNOW-376
VWR-197
@@ -547,8 +711,20 @@ Mm Alder
VWR-4232
VWR-4794
VWR-13578
+Mo Hax
+Mourna Biziou
Mr Greggan
VWR-445
+Nao Noe
+naofan Teardrop
+Naomah Beaumont
+Nathiel Siamendes
+Nber Medici
+Neko Link
+Netpat Igaly
+Neutron Chesnokov
+Newfie Pendragon
+Nicholai Laviscu
Nicholaz Beresford
VWR-132
VWR-176
@@ -619,12 +795,19 @@ Nicholaz Beresford
VWR-2412
VWR-2682
VWR-2684
+Nick Rhodes
Nicky Perian
OPEN-1
STORM-1087
STORM-1090
+Nicoladie Gymnast
Nounouch Hapmouche
VWR-238
+Ollie Kubrick
+Orenj Marat
+Orion Delphis
+Oryx Tempel
+Parvati Silverweb
Patric Mills
VWR-2645
Paul Churchill
@@ -647,6 +830,9 @@ Peekay Semyorka
VWR-79
Peter Lameth
VWR-7331
+PeterPunk Mooney
+Pixel Gausman
+Pixel Scientist
Pf Shan
CT-225
CT-226
@@ -657,15 +843,29 @@ Pf Shan
CT-231
CT-321
SNOW-422
+Polo Gufler
+Pounce Teazle
princess niven
VWR-5733
CT-85
CT-320
CT-352
+Professor Noarlunga
+Psi Merlin
+Quantum Destiny
+Questar Utu
+Quicksilver Hermes
+RAT Quan
+Radio Signals
+Ralf Setsuko
+RedMokum Bravin
Renault Clio
VWR-1976
resu Ampan
SNOW-93
+Revolution Perenti
+Rezit Sideways
+Rich Grainger
Ringo Tuxing
CT-225
CT-226
@@ -675,6 +875,7 @@ Ringo Tuxing
CT-230
CT-231
CT-321
+Riva
Robin Cornelius
SNOW-108
SNOW-204
@@ -706,9 +907,17 @@ Robin Cornelius
VWR-12763
VWR-12995
VWR-20911
+Rosco Teardrop
+Rose Evans
+Rudee Voom
+RufusTT Horsefly
Ryozu Kojima
VWR-53
VWR-287
+Sachi Vixen
+Sahkolihaa Contepomi
+Saii Hallard
+SaintLEOlions Zimer
Salahzar Stenvaag
CT-225
CT-226
@@ -718,11 +927,15 @@ Salahzar Stenvaag
CT-230
CT-231
CT-321
+Samm Larkham
Sammy Frederix
VWR-6186
+Sasy Scarborough
+Satanello Miami
Satomi Ahn
STORM-501
STORM-229
+Scrim Pinion
Scrippy Scofield
VWR-3748
Seg Baphomet
@@ -742,11 +955,16 @@ Sergen Davies
CT-230
CT-231
CT-321
+SexySteven Morrisey
Shawn Kaufmat
SNOW-240
+Sheet Spotter
+Shnurui Troughton
Siana Gearz
STORM-960
STORM-1088
+sicarius Thorne
+Sicarius Toxx
SignpostMarv Martin
VWR-153
VWR-154
@@ -756,6 +974,10 @@ SignpostMarv Martin
VWR-8357
Simon Nolan
VWR-409
+Sini Nubalo
+Sitearm Madonna
+SLB Wirefly
+snowy Sidran
SpacedOut Frye
VWR-34
VWR-45
@@ -768,8 +990,13 @@ SpacedOut Frye
VWR-1823
Sporked Friis
VWR-4903
+Soupa Segura
+Squirrel Wood
+ST Mensing
+Starshine Halasy
Stevex Janus
VWR-1182
+Stickman Ingmann
Still Defiant
VWR-207
VWR-227
@@ -785,8 +1012,13 @@ Strife Onizuka
VWR-2265
VWR-4111
SNOW-691
+Sudane Erato
+Synystyr Texan
+Takeda Terrawyng
TankMaster Finesmith
STORM-1100
+Talamasca
+Tali Rosca
Tayra Dagostino
SNOW-517
SNOW-543
@@ -817,8 +1049,10 @@ Techwolf Lupindo
SNOW-746
VWR-12385
VWR-20893
+Templar Merlin
tenebrous pau
VWR-247
+Tezcatlipoca Bisiani
Tharax Ferraris
VWR-605
Thickbrick Sleaford
@@ -841,16 +1075,23 @@ Thickbrick Sleaford
Thraxis Epsilon
SVC-371
VWR-383
+Tiel Stonecutter
tiamat bingyi
CT-246
Tofu Buzzard
CTS-411
STORM-546
VWR-24509
+Tony Kembia
+Torben Trautman
+TouchaHoney Perhaps
TraductoresAnonimos Alter
CT-324
+Trey Reanimator
TriloByte Zanzibar
STORM-1100
+Trinity Dechou
+Trinity Dejavu
Tue Torok
CT-68
CT-69
@@ -866,13 +1107,26 @@ Twisted Laws
STORM-643
STORM-954
STORM-1103
+Unlikely Quintessa
+UsikuFarasi Kanarik
Vadim Bigbear
VWR-2681
Vector Hastings
VWR-8726
+Veritas Raymaker
+Vex Streeter
+Viaticus Speculaas
+Vick Forcella
+Villain Baroque
Vixen Heron
VWR-2710
CT-88
+Vixie Durant
+Void Singer
+Watty Berkson
+Westley Schridde
+Westley Streeter
+Whimsy Winx
Whoops Babii
VWR-631
VWR-1640
@@ -898,6 +1152,7 @@ Whoops Babii
VWR-8296
VWR-8297
VWR-8298
+Winter Ventura
Wilton Lundquist
VWR-7682
WolfPup Lowenhar
@@ -922,10 +1177,19 @@ WolfPup Lowenhar
STORM-1098
VWR-20741
VWR-20933
+Wundur Primbee
+Xiki Luik
+xstorm Radek
+YongYong Francois
+Zak Westminster
Zai Lynch
VWR-19505
+Zana Kohime
+Zaren Alexander
Zarkonnen Decosta
VWR-253
+Zeja Pyle
+ZenMondo Wormser
Zi Ree
VWR-423
VWR-671
@@ -936,4 +1200,8 @@ Zi Ree
Zipherius Turas
VWR-76
VWR-77
+Zoex Flanagan
+
+
+
diff --git a/doc/translations.txt b/doc/translations.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c9cfc1cdeb59b9145468f9f4821beff196fe82f2
--- /dev/null
+++ b/doc/translations.txt
@@ -0,0 +1,26 @@
+#List of translators who contribute to SL Viewer 2.0+ and SL web translation by language
+
+ Danish
+Flemming Congrejo
+ French
+Valerie Linden
+ Polish
+Identity Euler
+ Portuguese
+Zaza Linden
+ Spanish
+Aralara Rajal
+Aura Dirval
+Cayu Cluny
+Eva Rau
+FreeSL Aeon
+Frontera Thor
+Inma Rau
+Irene Muni
+Lunita Savira
+Minerva Memel
+Polo Gufler
+Xiki Luik
+Perez Linden
+ Traditional Chinese
+gefeit Dufaux
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 2873bc00599e6fcd5c26e82be55841db738a42e4..cf52ee71ead704069f5e3edfc23850a77583347d 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -26,6 +26,8 @@
*/
#include "llviewerprecompiledheaders.h"
+#include <iostream>
+#include <fstream>
#include "llfloaterabout.h"
@@ -108,8 +110,11 @@ BOOL LLFloaterAbout::postBuild()
LLViewerTextEditor *support_widget =
getChild<LLViewerTextEditor>("support_editor", true);
- LLViewerTextEditor *credits_widget =
- getChild<LLViewerTextEditor>("credits_editor", true);
+ LLViewerTextEditor *contrib_names_widget =
+ getChild<LLViewerTextEditor>("contrib_names", true);
+
+ LLViewerTextEditor *trans_names_widget =
+ getChild<LLViewerTextEditor>("trans_names", true);
getChild<LLUICtrl>("copy_btn")->setCommitCallback(
boost::bind(&LLFloaterAbout::onClickCopyToClipboard, this));
@@ -190,8 +195,41 @@ BOOL LLFloaterAbout::postBuild()
support_widget->setEnabled(FALSE);
support_widget->startOfDoc();
- credits_widget->setEnabled(FALSE);
- credits_widget->startOfDoc();
+ // Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time
+ std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt");
+ llifstream contrib_file;
+ std::string contributors;
+ contrib_file.open(contributors_path); /* Flawfinder: ignore */
+ if (contrib_file.is_open())
+ {
+ std::getline(contrib_file, contributors); // all names are on a single line
+ contrib_file.close();
+ }
+ else
+ {
+ LL_WARNS("AboutInit") << "Could not read contributors file at " << contributors_path << LL_ENDL;
+ }
+ contrib_names_widget->setText(contributors);
+ contrib_names_widget->setEnabled(FALSE);
+ contrib_names_widget->startOfDoc();
+
+ // Get the names of translators, extracted from .../doc/tranlations.txt by viewer_manifest.py at build time
+ std::string translators_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"translators.txt");
+ llifstream trans_file;
+ std::string translators;
+ trans_file.open(translators_path); /* Flawfinder: ignore */
+ if (trans_file.is_open())
+ {
+ std::getline(trans_file, translators); // all names are on a single line
+ trans_file.close();
+ }
+ else
+ {
+ LL_WARNS("AboutInit") << "Could not read translators file at " << translators_path << LL_ENDL;
+ }
+ trans_names_widget->setText(translators);
+ trans_names_widget->setEnabled(FALSE);
+ trans_names_widget->startOfDoc();
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index a8b3ce9c28fe6ee52a03ab04dd848fa7592f22fe..2595c1ee3b4d2423ffe7a19aede2d68d95f7966e 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -98,26 +98,55 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
label="Credits"
help_topic="about_credits_tab"
name="credits_panel">
+ <text
+ follows="top|left|right"
+ height="15"
+ layout="topleft"
+ left="5"
+ name="contrib_intro"
+ top="15"
+ width="435"
+ wrap="true">
+Second Life is brought to you by the Lindens, with open source contributions from:
+ </text>
<text_editor
enabled="false"
- follows="left|top"
- height="375"
+ follows="top|left"
+ height="180"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"
max_length="65536"
- name="credits_editor"
- top="5"
+ name="contrib_names"
+ top_pad="10"
width="435"
word_wrap="true">
-Second Life is brought to you by Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, 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, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, 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, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, 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, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain, and many others.
-
-Thank you to the following Residents for helping to ensure that this is the best version yet: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan, and many others.
-
-
-
-
-"The work goes on, the cause endures, the hope still lives, and the dreams shall never die" - Edward Kennedy
+Dummy Name replaced at run time
+ </text_editor>
+ <text
+ follows="top|left"
+ height="15"
+ layout="topleft"
+ left="5"
+ name="trans_intro"
+ top_pad="10"
+ width="435"
+ wrap="true">
+and translations from:
+ </text>
+ <text_editor
+ enabled="false"
+ follows="top|left"
+ height="180"
+ bg_readonly_color="Transparent"
+ left="5"
+ text_color="LtGray"
+ max_length="65536"
+ name="trans_names"
+ top_pad="10"
+ width="435"
+ word_wrap="true">
+Dummy Name replaced at run time
</text_editor>
</panel>
<panel
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8aa94616d67bc7835de696246e538107e9037192..bd0193e0f6e591ad4ecc022fb6abe275bc54988b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -31,6 +31,7 @@
import re
import tarfile
import time
+import random
viewer_dir = os.path.dirname(__file__)
# add llmanifest library to our path so we don't have to muck with PYTHONPATH
sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util'))
@@ -62,6 +63,12 @@ def construct(self):
# include the entire shaders directory recursively
self.path("shaders")
+ # inclue the extracted lists of contributors
+ contributor_names = self.extract_names("../../doc/contributions.txt")
+ self.put_in_file(contributor_names, "contributors.txt")
+ # inclue the extracted lists of translators
+ translator_names = self.extract_names("../../doc/translations.txt")
+ self.put_in_file(translator_names, "translators.txt")
# ... and the entire windlight directory
self.path("windlight")
self.end_prefix("app_settings")
@@ -174,6 +181,28 @@ def flags_list(self):
return " ".join((channel_flags, grid_flags, setting_flags)).strip()
+ def extract_names(self,src):
+ try:
+ contrib_file = open(src,'r')
+ except IOError:
+ print "Failed to open '%s'" % src
+ raise
+ lines = contrib_file.readlines()
+ contrib_file.close()
+
+ # All lines up to and including the first blank line are the file header; skip them
+ lines.reverse() # so that pop will pull from first to last line
+ while not re.match("\s*$", lines.pop()) :
+ pass # do nothing
+
+ # A line that starts with a non-whitespace character is a name; all others describe contributions, so collect the names
+ names = []
+ for line in lines :
+ if re.match("\S", line) :
+ names.append(line.rstrip())
+ # It's not fair to always put the same people at the head of the list
+ random.shuffle(names)
+ return ', '.join(names)
class WindowsManifest(ViewerManifest):
def final_exe(self):