svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

1 files changed, 17 insertions, 17 deletions

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 7c69fc6648..79ec70fb1c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -258,7 +258,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 	color_swatch->setVisible(FALSE);
 	childSetVisible("val_text", FALSE);
 	childSetVisible("boolean_combo", FALSE);
-	mComment->setText("");
+	mComment->setText(LLString::null);
 
 	if (controlp)
 	{
@@ -294,7 +294,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 		{
 		  case TYPE_U32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("value");
+			spinner1->setLabel(LLString("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setValue(sd);
@@ -306,7 +306,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			break;
 		  case TYPE_S32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("value");
+			spinner1->setLabel(LLString("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setValue(sd);
@@ -318,7 +318,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			break;
 		  case TYPE_F32:
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("value");
+			spinner1->setLabel(LLString("value")); // Debug, don't translate
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -352,11 +352,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			LLVector3 v;
 			v.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("X");
+			spinner1->setLabel(LLString("X"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel("Y");
+			spinner2->setLabel(LLString("Y"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel("Z");
+			spinner3->setLabel(LLString("Z"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -379,11 +379,11 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			LLVector3d v;
 			v.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("X");
+			spinner1->setLabel(LLString("X"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel("Y");
+			spinner2->setLabel(LLString("Y"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel("Z");
+			spinner3->setLabel(LLString("Z"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(3);
@@ -406,13 +406,13 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			LLRect r;
 			r.setValue(sd);
 			spinner1->setVisible(TRUE);
-			spinner1->setLabel("Left");
+			spinner1->setLabel(LLString("Left"));
 			spinner2->setVisible(TRUE);
-			spinner2->setLabel("Right");
+			spinner2->setLabel(LLString("Right"));
 			spinner3->setVisible(TRUE);
-			spinner3->setLabel("Bottom");
+			spinner3->setLabel(LLString("Bottom"));
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel("Top");
+			spinner4->setLabel(LLString("Top"));
 			if (!spinner1->hasFocus())
 			{
 				spinner1->setPrecision(0);
@@ -462,7 +462,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 				color_swatch->set(LLColor4(sd), TRUE, FALSE);
 			}
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel("Alpha");
+			spinner4->setLabel(LLString("Alpha"));
 			if (!spinner4->hasFocus())
 			{
 				spinner4->setPrecision(3);
@@ -490,7 +490,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 				color_swatch->set(LLColor4(clr), TRUE, FALSE);
 			}
 			spinner4->setVisible(TRUE);
-			spinner4->setLabel("Alpha");
+			spinner4->setLabel(LLString("Alpha"));
 			if(!spinner4->hasFocus())
 			{
 				spinner4->setPrecision(0);
@@ -504,7 +504,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 			break;
 		  }
 		  default:
-			mComment->setText("unknown");
+			mComment->setText(LLString("unknown"));
 			break;
 		}
 	}