aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llfloaterabout.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterabout.cpp')
-rw-r--r--linden/indra/newview/llfloaterabout.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index b259455..460b719 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -3,6 +3,8 @@
3 * @author James Cook 3 * @author James Cook
4 * @brief The about box from Help->About 4 * @brief The about box from Help->About
5 * 5 *
6 * $LicenseInfo:firstyear=2001&license=viewergpl$
7 *
6 * Copyright (c) 2001-2007, Linden Research, Inc. 8 * Copyright (c) 2001-2007, Linden Research, Inc.
7 * 9 *
8 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 27 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27 * COMPLETENESS OR PERFORMANCE. 29 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$
28 */ 31 */
29 32
30#include "llviewerprecompiledheaders.h" 33#include "llviewerprecompiledheaders.h"
@@ -93,10 +96,10 @@ LLFloaterAbout::LLFloaterAbout()
93 LLViewerRegion* region = gAgent.getRegion(); 96 LLViewerRegion* region = gAgent.getRegion();
94 if (region) 97 if (region)
95 { 98 {
96 //XUI:translate
97 const LLVector3d &pos = gAgent.getPositionGlobal(); 99 const LLVector3d &pos = gAgent.getPositionGlobal();
98 LLString pos_text = llformat("You are at %.1f, %.1f, %.1f ", 100 LLUIString pos_text = childGetText("you_are_at");
99 pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ]); 101 pos_text.setArg("[POSITION]",
102 llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ]));
100 support.append(pos_text); 103 support.append(pos_text);
101 104
102 LLString region_text = llformat("in %s located at ", 105 LLString region_text = llformat("in %s located at ",
@@ -114,6 +117,10 @@ LLFloaterAbout::LLFloaterAbout()
114 support.append("\n\n"); 117 support.append("\n\n");
115 } 118 }
116 119
120 //*NOTE: Do not translate text like GPU, Graphics Card, etc -
121 // Most PC users that know what these mean will be used to the english versions,
122 // and this info sometimes gets sent to support
123
117 // CPU 124 // CPU
118 support.append("CPU: "); 125 support.append("CPU: ");
119 support.append( gSysCPU.getCPUString() ); 126 support.append( gSysCPU.getCPUString() );