Author: humdinger Date: 2011-04-09 14:21:04 +0200 (Sat, 09 Apr 2011) New Revision: 41207 Changeset: https://dev.haiku-os.org/changeset/41207 Ticket: https://dev.haiku-os.org/ticket/7327 Modified: haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp Log: Renamed a few strings as discussed in #7327 by applying xray's patch with a few additions. Closing #7327. Modified: haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp =================================================================== --- haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp 2011-04-08 18:34:11 UTC (rev 41206) +++ haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp 2011-04-09 12:21:04 UTC (rev 41207) @@ -291,7 +291,7 @@ rect.left = fAddButton->Frame().right + 8; AddChild(fSettingsBox = new BBox(rect, "SettingsBox", B_FOLLOW_ALL, B_WILL_DRAW)); - fSettingsBox->SetLabel(B_TRANSLATE("Module settings")); + fSettingsBox->SetLabel(B_TRANSLATE("Screensaver settings")); PopulateScreenSaverList(); fFilePanel = new BFilePanel(); @@ -634,7 +634,7 @@ // Create the controls inside the tabs rect = fTabView->ContainerView()->Bounds(); _SetupFadeTab(rect); - fModulesView = new ModulesView(rect, B_TRANSLATE("Modules"), fSettings); + fModulesView = new ModulesView(rect, B_TRANSLATE("Screensavers"), fSettings); fTabView->AddTab(fFadeView); fTabView->AddTab(fModulesView); @@ -677,11 +677,11 @@ } -//! Create the controls for the fade tab +//! Create the controls for the "General" tab void ScreenSaverWindow::_SetupFadeTab(BRect rect) { - fFadeView = new FadeView(rect, B_TRANSLATE("Fade"), fSettings); + fFadeView = new FadeView(rect, B_TRANSLATE("General"), fSettings); float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off " "screen")) + 20.0f; @@ -695,7 +695,7 @@ + floorf(textHeight / 2); fEnableCheckBox = new BCheckBox(BRect(0, 0, 1, 1), "EnableCheckBox", - B_TRANSLATE("Enable screen saver"), + B_TRANSLATE("Enable screensaver"), new BMessage(kMsgEnableScreenSaverBox)); fEnableCheckBox->ResizeToPreferred(); @@ -709,7 +709,7 @@ rect.top = fEnableCheckBox->Bounds().bottom + 8.0f; rect.right = box->Bounds().right - 8; BStringView* stringView = new BStringView(rect, NULL, - B_TRANSLATE("Run module")); + B_TRANSLATE("Start screensaver")); stringView->ResizeToPreferred(); box->AddChild(stringView); @@ -913,7 +913,7 @@ void ScreenSaverWindow::MessageReceived(BMessage *msg) { - // "Fade" tab, slider updates + // "Settings" tab, slider updates switch (msg->what) { case kMsgRunSliderChanged: @@ -939,7 +939,7 @@ } switch (msg->what) { - // "Fade" tab + // "General" tab case kMsgTurnOffCheckBox: fTurnOffSlider->SetEnabled( @@ -961,7 +961,7 @@ fPasswordWindow->Show(); break; - // "Modules" tab + // "Screensavers" tab case kMsgUpdateList: fModulesView->PopulateScreenSaverList();