Updated to use B_TRANSLATE* macros. relates to #5408.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36683 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/preferences/cpufrequency/CPUFrequencyView.cpp

@@ -44,21 +44,22 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
 	BRect rect = Bounds();
 	rect.InsetBy(5, 5);
 	BBox *policyBox = new BBox(rect, "policyBox");
-	policyBox->SetLabel(TR("Stepping policy"));
+	policyBox->SetLabel(B_TRANSLATE("Stepping policy"));
 	BGroupLayout* policyLayout = new BGroupLayout(B_VERTICAL);
 	policyLayout->SetInsets(10, policyBox->TopBorderOffset() * 2 + 10, 10, 10);
 	policyLayout->SetSpacing(10);
 	policyBox->SetLayout(policyLayout);
 	mainLayout->AddView(policyBox);
 
-	fPolicyMenu = new BMenu(TR("Stepping policy: "));
+	fPolicyMenu = new BMenu(B_TRANSLATE("Stepping policy: "));
-	BMenuField *menuField = new BMenuField(TR("Stepping policy: "), fPolicyMenu);
+	BMenuField *menuField = new BMenuField(
+		B_TRANSLATE("Stepping policy: "), fPolicyMenu);
 
 	policyLayout->AddView(menuField);
 
 	// dynamic stepping
 	BBox *dynamicBox = new BBox(rect, "dynamicBox");
-	dynamicBox->SetLabel(TR("Dynamic stepping"));
+	dynamicBox->SetLabel(B_TRANSLATE("Dynamic stepping"));
 	BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL);
 	dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10,
 								10, 10);
@@ -71,7 +72,8 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
 
 	fIntegrationTime = new BTextControl(BRect(0,0,Bounds().Width(),10),
 										"intergal",
-											TR("Integration time [ms]: "), "",
+										B_TRANSLATE("Integration time [ms]: "),
+										"",
 										new BMessage(kIntegrationTimeChanged));
 
 	dynamicLayout->AddView(fColorStepView);
@@ -79,7 +81,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
 
 	// status view
 	BBox *statusBox = new BBox(rect, "statusBox");
-	statusBox->SetLabel(TR("CPU frequency status view"));
+	statusBox->SetLabel(B_TRANSLATE("CPU frequency status view"));
 	BGroupLayout* statusLayout = new BGroupLayout(B_HORIZONTAL);
 	statusLayout->SetInsets(10, statusBox->TopBorderOffset() * 2 + 10, 10, 10);
 	statusLayout->SetSpacing(10);
@@ -91,7 +93,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
 	fStatusView->ShowPopUpMenu(false);
 
 	fInstallButton = new BButton("installButton",
-									TR("Install replicant into Deskbar"),
+								B_TRANSLATE("Install replicant into Deskbar"),
 								new BMessage(kInstallIntoDeskbar));
 
 	statusLayout->AddView(fStatusView);

src/preferences/cpufrequency/ColorStepView.cpp

@@ -285,7 +285,8 @@ ColorStepView::_InitView()
 
 	BRect sliderFrame(Bounds());
 
-	fSlider = new BSlider(sliderFrame, "StepSlider", TR("Step up by CPU usage"),
+	fSlider = new BSlider(sliderFrame, "StepSlider",
+							B_TRANSLATE("Step up by CPU usage"),
 							new BMessage(kSteppingChanged), 0, 100);
 	fSlider->SetModificationMessage(new BMessage(kMSGSliderChanged));
 

src/preferences/cpufrequency/PreferencesWindow.h

@@ -333,11 +333,14 @@ PreferencesWindow<Preferences>::PreferencesWindow(const char* title,
 	fPreferencesView(NULL)
 {
 	BGroupView* buttonView = new BGroupView(B_HORIZONTAL);
-	fDefaultButton = new BButton(TR("Defaults"), new BMessage(kDefaultMsg));
+	fDefaultButton = new BButton(B_TRANSLATE("Defaults"),
+		new BMessage(kDefaultMsg));
 
 	buttonView->AddChild(fDefaultButton);
-	buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateHorizontalStrut(7));
+	buttonView->GetLayout()->AddItem(
-	fRevertButton = new BButton(TR("Revert"), new BMessage(kRevertMsg));
+		BSpaceLayoutItem::CreateHorizontalStrut(7));
+	fRevertButton = new BButton(B_TRANSLATE("Revert"),
+		new BMessage(kRevertMsg));
 
 	fRevertButton->SetEnabled(false);
 	buttonView->AddChild(fRevertButton);

src/preferences/cpufrequency/StatusView.cpp

@@ -41,16 +41,16 @@ extern "C" _EXPORT BView *instantiate_deskbar_item(void);
  * So we mark them explicitly here.
  */
 void notUsed() {
-	TR_MARK("Dynamic performance");
+	B_TRANSLATE_MARK("Dynamic performance");
-	TR_MARK("High performance");
+	B_TRANSLATE_MARK("High performance");
-	TR_MARK("Low energy");
+	B_TRANSLATE_MARK("Low energy");
-	TR_MARK("Set state");
+	B_TRANSLATE_MARK("Set state");
-	TR_MARK("CPUFrequency\n"
+	B_TRANSLATE_MARK("CPUFrequency\n"
 			"\twritten by Clemens Zeidler\n"
 			"\tCopyright 2009, Haiku, Inc.\n");
-	TR_MARK("Ok");
+	B_TRANSLATE_MARK("Ok");
-	TR_MARK("Open Speedstep preferences" B_UTF8_ELLIPSIS);
+	B_TRANSLATE_MARK("Open Speedstep preferences" B_UTF8_ELLIPSIS);
-	TR_MARK("Quit");
+	B_TRANSLATE_MARK("Quit");
 }
 
 // messages FrequencySwitcher
@@ -223,14 +223,15 @@ FrequencyMenu::FrequencyMenu(BMenu* menu, BHandler* target,
 	fHighPerformance = new BMenuItem(
 		catalog.GetString("High performance", TR_CONTEXT),
 		new BMessage(kMsgPolicyPerformance));
-	fLowEnergie = new BMenuItem(catalog.GetString("Low energy",TR_CONTEXT),
+	fLowEnergie = new BMenuItem(catalog.GetString("Low energy",
-		new BMessage(kMsgPolicyLowEnergy));
+		TR_CONTEXT), new BMessage(kMsgPolicyLowEnergy));
 
 	menu->AddItem(fDynamicPerformance);
 	menu->AddItem(fHighPerformance);
 	menu->AddItem(fLowEnergie);
 
-	fCustomStateMenu = new BMenu(catalog.GetString("Set state",TR_CONTEXT));
+	fCustomStateMenu = new BMenu(catalog.GetString("Set state",
+		TR_CONTEXT));
 
 	StateList* stateList = fInterface->GetCpuFrequencyStates();
 	for (int i = 0; i < stateList->CountItems(); i++) {
@@ -506,8 +507,8 @@ StatusView::AttachedToWindow()
 
 	// perferences menu
 	fPreferencesMenu = new BPopUpMenu(B_EMPTY_STRING, false, false);
-	fPreferencesMenuFilter = new FrequencyMenu(fPreferencesMenu, this, fStorage,
+	fPreferencesMenuFilter = new FrequencyMenu(fPreferencesMenu, this,
-		&fDriverInterface);
+		fStorage, &fDriverInterface);
 
 	fPreferencesMenu->SetFont(be_plain_font);
 
@@ -519,8 +520,8 @@ StatusView::AttachedToWindow()
 	fOpenPrefItem->SetTarget(this);
 
 	if (fInDeskbar) {
-		fQuitItem= new BMenuItem(fCatalog.GetString("Quit", TR_CONTEXT),
+		fQuitItem= new BMenuItem(fCatalog.GetString("Quit",
-			new BMessage(B_QUIT_REQUESTED));
+			TR_CONTEXT), new BMessage(B_QUIT_REQUESTED));
 		fPreferencesMenu->AddItem(fQuitItem);
 		fQuitItem->SetTarget(this);
 	}
@@ -684,8 +685,8 @@ StatusView::_OpenPreferences()
 			ret = be_roster->ActivateApp(info.team);
 	}
 	if (ret < B_OK) {
-		BString errorMessage(TR("Launching the CPU frequency preflet failed.\n\n"
+		BString errorMessage(B_TRANSLATE(
-			"Error: "));
+			"Launching the CPU frequency preflet failed.\n\nError: "));
 		errorMessage << strerror(ret);
 		BAlert* alert = new BAlert("launch error", errorMessage.String(),
 			"Ok");

src/preferences/cpufrequency/main.cpp

@@ -23,7 +23,8 @@ main(int argc, char* argv[])
 	be_locale->GetAppCatalog(&cat);
 
 	PreferencesWindow<freq_preferences> *window;
-	window = new PreferencesWindow<freq_preferences>(TR("CPU Frequency"),
+	window = new PreferencesWindow<freq_preferences>(
+												B_TRANSLATE("CPU Frequency"),
 												kPreferencesFileName,
 												kDefaultPreferences);
 	CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350),