diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index deebb57e9..27df264af 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -1963,6 +1963,8 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 		child->getAttributeString("type", type);
 		child->getAttributeString("name", item_name);
 		child->getAttributeString("label", source_label);
+
+		LLStringUtil::format(source_label, LLTrans::getDefaultArgs());
 		
 		// parse jump key out of label
 		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
@@ -2303,6 +2305,8 @@ LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
 	std::string label = name;
 	node->getAttributeString("label", label);
 
+	LLStringUtil::format(label, LLTrans::getDefaultArgs());
+
 	// parse jump key out of label
 	std::string new_menu_label;
 
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 75e60e0a3..188c19b15 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -2,13 +2,10 @@
 <floater name="floater_about" title="Über Singularity">
   <tab_container name="about_tab">
     <panel label="Info" name="support_panel">
-      
       <button label="In Zwischenablage kopieren" name="copy_btn"/>
     </panel>
-
-    
-
-    
-  </tab_container>  
+    <panel label="Würdigung" name="credits_panel"/>
+    <panel label="Lizenzen" name="licenses_panel"/>
+  </tab_container>
   <string name="you_are_at">Sie befinden sich in [POSITION]</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index c0beedced..9958279ec 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Hilfe zu Snowglobe/Second Life" name="Second Life Help"/>
-		<menu_item_call label="Über Snowglobe..." name="About Second Life..."/>
+		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 8027e615a..71a41de40 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -257,7 +257,7 @@
 			<menu_item_call label="Singularity Problem berichten..." name="Report Singularity Bug..."/>
 			<menu_item_call label="Neue Funktionalität nachfragen..." name="Request New Feature..."/>
 		</menu>
-		<menu_item_call label="Über Snowglobe..." name="About Second Life..."/>
+		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 	<menu label="Singularity" name="Singularity">
 		<menu_item_call label="Alle Dialoge schließen" name="Close All Dialogs"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_login.xml b/indra/newview/skins/default/xui/en-us/menu_login.xml
index 8b4e4ff86..6674ccd3a 100644
--- a/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -25,7 +25,7 @@
 		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" label="About Singularity..." left="0"
+		<menu_item_call bottom="-48" enabled="true" height="19" label="About [APP_NAME]..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index e136cbc1f..d72d44242 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -981,7 +981,7 @@
 				<on_click function="PromptShowURL" name="RequestFeature_url" userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry?template=Feature%20request"/>
 			</menu_item_call>
 		</menu>
-		<menu_item_call bottom="-313" enabled="true" height="19" label="About Singularity..." left="0"
+		<menu_item_call bottom="-313" enabled="true" height="19" label="About [APP_NAME]..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 285988210..fd18946c2 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Acerca de Singularity Viewer">
-	<tab_container name="about_tab">
-		<panel label="Información" help_topic="about_support_tab" name="support_panel">
-			<button label="Copiar al portapapeles" name="copy_btn"/>
-		</panel>
-
-		<panel label="Créditos" help_topic="about_credits_tab" name="credits_panel"/>
-
-		<panel label="Licencias" name="licenses_panel"/>
-	</tab_container>  
-	<string name="you_are_at">Estás en [POSITION]</string>
+  <tab_container name="about_tab">
+    <panel label="Información" name="support_panel">
+      <button label="Copiar al portapapeles" name="copy_btn"/>
+    </panel>
+    <panel label="Créditos" name="credits_panel"/>
+    <panel label="Licencias" name="licenses_panel"/>
+  </tab_container>
+  <string name="you_are_at">Estás en [POSITION]</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 1f6f3bb30..59d222070 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -135,7 +135,7 @@
 	<button label="Activar" name="activate_btn"/>
 	<text_editor name="voice_morphing_link">
 		Suscríbete ahora
-	</text>
+	</text_editor>
 	<scroll_list name="voice_effect_list" tool_tip="Graba una muestra de tu voz y pulsa en un efecto para ver cómo suena.">
 		<scroll_list.columns label="Nombre de la voz" name="name"/>
 		<scroll_list.columns label="Caduca" name="expires"/>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 9d486da8d..1065b13f7 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu name="Help" label="Ayuda" >
 		<menu_item_call name="Second Life Help" label="Ayuda de Second Life"/>
-		<menu_item_call name="About Second Life..." label="Acerca de Singularity..."/>
+		<menu_item_call name="About Second Life..." label="Acerca de [APP_NAME]..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index ac153de75..2df6bc96f 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -211,7 +211,7 @@
 			<menu_item_call label="Informar Fallos de Singularity..." name="Report Singularity Bug..."/>
 			<menu_item_call label="Solicitar Nueva Característica..." name="Request New Feature..."/>			
 		</menu>
-		<menu_item_call label="Acerca de Singularity..." name="About Second Life..."/>
+		<menu_item_call label="Acerca de [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 	<!-- ============================= -->
 	<menu label="Singularity" name="Singularity">
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 32ee3666b..7518abe02 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="A propos de Singularity">
   <tab_container name="about_tab">
     <panel label="Info" help_topic="about_support_tab" name="support_panel">
       <button label="Copier dans le presse-papier" name="copy_btn"/>
     </panel>
-
-	<panel label="Credits" help_topic="about_credits_tab" name="credits_panel"/>
-
-	<panel label="Licenses" name="licenses_panel"/>
-  </tab_container>  
+    <panel label="Remerciements" name="credits_panel"/>
+    <panel label="Licenses" name="licenses_panel"/>
+  </tab_container>
   <string name="you_are_at">You are at [POSITION]</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 0b6e62c29..4d63f9f43 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -14,7 +14,7 @@
 		<menu_item_call name="Second Life Help" label="Aide de Second Life">
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call>
-		<menu_item_call name="About Second Life..." label="A propos de Singularity">
+		<menu_item_call name="About Second Life..." label="A propos de [APP_NAME]">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 6d4bd005a..477a728b8 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -240,6 +240,6 @@
 			<menu_item_separator label="-----------" name="separator9"/>
 			<menu_item_call label="Signaler un bug" name="Report Bug..."/>
 		</menu>
-		<menu_item_call label="A propos de Singularity" name="About Second Life..."/>
+		<menu_item_call label="A propos de [APP_NAME]" name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 93096f319..012c71823 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -1,54 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Informazioni su Second Life">
-	<text_editor name="credits_editor">
-Phoenix é stato creato da
-Ansariel Hiller, Arrehn Oberlander, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGreggreg Back, Mobius Ryba, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Vortex Saito, WoLf Loonie e Wolfspirit Magic.
-
-Un ringraziamanento speciale al nostro gruppo di supporto:
-Albatroz Hird, AleiaSerenity Sapphire, AngelBlack123 Akins, Atthosz Amiot, Basement Desade, Burke Wilkinson, Ed Merryman, Gee McAuley, Jotunn Qi, Lette Ponnier, Marybeth Oceanlane, Miro Collas, Nisa Maverick, Norton Burns, Patience Porta, Pudenta Magic, PixelProphet Lane, Riku Highfield, Router Gray, SaHaRa Connor, Selene Gregoire, Srilania Svoboda, TankMaster Finesmith, Thea Brianna, Whirly Fizzle, Wolfspirit Magic, e XLR8RRICK Hudson.
-
-Altro codice contribuito da:
-Chalice Yao, Lance Corrimal, Nogardrevlis Lectar, Siana Gearz, Sione Lomu, e Toy Wylie.
-
-Phoenix is based on Emerald 1.5.0.2587, which was brought to you by:
-Ayamo Nozaki, Chalice Yao, Chris Tuchs, Danny Nolan, Discrete Dreamscape, Draconis Neurocam, Fractured Crystal, Hyang Zhao, Jessica Lyon, Katharine Berry, Kitty Barnett, Lonely Bluebird, LordGregGreg Back, Moy Loon, Qarl Fizz, Sam Darrow, Skills Hak, Tonya Souther, Vortex Saito, WoLf Loonie, Zwagoth Klaar and many others.
-
-Snowglobe includes source code contributions of the following residents:
-Able Whitman, Adam Marker, Admiral Admiral, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Archimedes Plutonian, Ardy Lay, Argent Stonecutter, Armin Weatherwax, Asuka Neely, Balp Allen, Be Holder, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Cypren Christenson, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kitty Barnett, Kunnis Basiat, Latif Khalifa, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Pixel Gausman, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, resu Ampan, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, Shawn Kaufmat, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, Techwolf Lupindo, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Twisted Laws, Vadim Bigbear, Vector Hastings, Vex Streeter, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
-
-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, Siana Gearz, 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, and many others.
-
-
-    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.
-
-    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>
-	<string name="you_are_at">
-		Sei a [POSITION]
-	</string>
+  <tab_container name="about_tab">
+    <panel label="Informazioni" name="support_panel">
+      <button label="Copia negli appunti" name="copy_btn"/>
+    </panel>
+    <panel label="Ringraziamenti" name="credits_panel"/>
+    <panel label="Licenze" name="licenses_panel"/>
+  </tab_container>
+  <string name="you_are_at">Sei a [POSITION]</string>
 </floater>
+
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 45ee43102..2fdf1dcd1 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Aiuto di Second Life" name="Second Life Help"/>
-		<menu_item_call label="Informazioni su Second Life..." name="About Second Life..."/>
+		<menu_item_call label="Informazioni su [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 36f0f9b2f..9e6a14d74 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -202,6 +202,6 @@
 			<menu_item_separator label="-----------" name="separator9"/>
 			<menu_item_call label="Segnala un bug..." name="Report Bug..."/>
 		</menu>
-		<menu_item_call label="Informazioni su Phoenix Viewer..." name="About Second Life..."/>
+		<menu_item_call label="Informazioni su [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index e6c599c6a..518b84210 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafica" name="Display panel">
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
-	<check_box label="Esegui Phoenix in una finestra" name="windowed mode"/>
+	<check_box label="Esegui in una finestra" name="windowed mode"/>
 	<text_editor name="FullScreenInfo" width="480">
 		Se deselezionato, all&apos;avvio il programma partirà a schermo intero.
 	</text_editor>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3513a704c..3bcc4dc6c 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -7,7 +7,7 @@
 		<menu_item_call label="Preferências..." name="Preferences..."/>
 	</menu>
 	<menu label="Ajuda" name="Help">
-		<menu_item_call label="Ajuda do Snowglobe/Second Life" name="Second Life Help"/>
-		<menu_item_call label="Sobre o Snowglobe..." name="About Second Life..."/>
+		<menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
+		<menu_item_call label="Sobre o [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 49d4bf512..f07b813bc 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -165,6 +165,6 @@
 			<menu_item_call label="Reportar Bug..." name="Report Bug..."/>
 			<menu_item_call label="Reportar Problemas com Singularity..." name="Report Singularity Bug..."/>
 		</menu>
-		<menu_item_call label="Sobre Singularity Viewer..." name="About Second Life..."/>
+		<menu_item_call label="Sobre [APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/scripts/check_xml.sh b/scripts/check_xml.sh
new file mode 100755
index 000000000..f093aa886
--- /dev/null
+++ b/scripts/check_xml.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+SAVEDIR=`pwd`
+
+SOURCE="${BASH_SOURCE[0]}"
+DIR="$( dirname "$SOURCE" )"
+while [ -h "$SOURCE" ]
+do 
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+  DIR="$( cd -P "$( dirname "$SOURCE"  )" && pwd )"
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+#echo $DIR
+cd $DIR/../indra/newview/
+
+if command -v xmllint >/dev/null 2>&1 ; then
+  LINT=xmllint
+else
+  echo 'Error - xmllint not found'
+  exit 1
+fi
+
+ESTATUS=0
+
+for FILE in `find . -name \*.xml`
+do
+  if ! $LINT $FILE >/dev/null 2>&1 ; then
+     ESTATUS=1
+     $LINT $FILE
+  fi
+done
+
+
+cd $SAVEDIR
+
+exit $ESTATUS
+