diff --git a/src/preferences/cpufrequency/CPUFrequencyView.cpp b/src/preferences/cpufrequency/CPUFrequencyView.cpp index 3a5e62ea16..c592672f08 100644 --- a/src/preferences/cpufrequency/CPUFrequencyView.cpp +++ b/src/preferences/cpufrequency/CPUFrequencyView.cpp @@ -11,11 +11,15 @@ #include "StatusView.h" #include +#include #include #include +#include #include #include +#define TR_CONTEXT "CPU Frequency View" + const char* kCPUFreqPreferencesFile = "CPUFrequency"; const char* kPrefSignature = "application/x-vnd.Haiku-CPUFrequencyPref"; const char* kPreferencesFileName = "CPUFrequency"; @@ -40,21 +44,21 @@ CPUFrequencyView::CPUFrequencyView(BRect frame, BRect rect = Bounds(); rect.InsetBy(5, 5); BBox *policyBox = new BBox(rect, "policyBox"); - policyBox->SetLabel("Stepping Policy"); + policyBox->SetLabel(TR("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("Stepping Policy"); - BMenuField *menuField = new BMenuField("Stepping Policy", fPolicyMenu); + fPolicyMenu = new BMenu(TR("Stepping Policy")); + BMenuField *menuField = new BMenuField(TR("Stepping Policy"), fPolicyMenu); policyLayout->AddView(menuField); // dynamic stepping BBox *dynamicBox = new BBox(rect, "dynamicBox"); - dynamicBox->SetLabel("Dynamic Stepping"); + dynamicBox->SetLabel(TR("Dynamic Stepping")); BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL); dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10, 10, 10); @@ -67,7 +71,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame, fIntegrationTime = new BTextControl(BRect(0,0,Bounds().Width(),10), "intergal", - "Integration Time [ms]", "", + TR("Integration Time [ms]"), "", new BMessage(kIntegrationTimeChanged)); dynamicLayout->AddView(fColorStepView); @@ -75,7 +79,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame, // status view BBox *statusBox = new BBox(rect, "statusBox"); - statusBox->SetLabel("CPU Frequency Status View"); + statusBox->SetLabel(TR("CPU Frequency Status View")); BGroupLayout* statusLayout = new BGroupLayout(B_HORIZONTAL); statusLayout->SetInsets(10, statusBox->TopBorderOffset() * 2 + 10, 10, 10); statusLayout->SetSpacing(10); @@ -87,7 +91,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame, fStatusView->ShowPopUpMenu(false); fInstallButton = new BButton("installButton", - "Install Replicant into Deskbar", + TR("Install Replicant into Deskbar"), new BMessage(kInstallIntoDeskbar)); statusLayout->AddView(fStatusView); diff --git a/src/preferences/cpufrequency/ColorStepView.cpp b/src/preferences/cpufrequency/ColorStepView.cpp index 5f044ce2ac..a1543fd38b 100644 --- a/src/preferences/cpufrequency/ColorStepView.cpp +++ b/src/preferences/cpufrequency/ColorStepView.cpp @@ -10,9 +10,14 @@ #include +#include +#include #include +#define TR_CONTEXT "Color Step View" + + const int32 kColorBarHeight = 15; const uint32 kMSGSliderChanged = '&slc'; @@ -280,7 +285,7 @@ ColorStepView::_InitView() BRect sliderFrame(Bounds()); - fSlider = new BSlider(sliderFrame, "StepSlider", "Step up by CPU usage:", + fSlider = new BSlider(sliderFrame, "StepSlider", TR("Step up by CPU usage:"), new BMessage(kSteppingChanged), 0, 100); fSlider->SetModificationMessage(new BMessage(kMSGSliderChanged)); diff --git a/src/preferences/cpufrequency/Jamfile b/src/preferences/cpufrequency/Jamfile index 177e6e90b5..931f6cb5bc 100644 --- a/src/preferences/cpufrequency/Jamfile +++ b/src/preferences/cpufrequency/Jamfile @@ -2,12 +2,25 @@ SubDir HAIKU_TOP src preferences cpufrequency ; UsePrivateHeaders shared ; -Preference CPUFrequency : +Preference CPUFrequency : ColorStepView.cpp CPUFrequencyView.cpp DriverInterface.cpp main.cpp StatusView.cpp - : be $(TARGET_LIBSUPC++) + : be $(TARGET_LIBSUPC++) liblocale.so : cpufrequency.rdef ; + +DoCatalogs CPUFrequency : + x-vnd.Haiku-CPUFrequencyPref + : + ColorStepView.cpp + CPUFrequencyView.cpp + main.cpp + StatusView.cpp + PreferencesWindow.h + : en.catalog + : fr.catkeys + ; + diff --git a/src/preferences/cpufrequency/PreferencesWindow.h b/src/preferences/cpufrequency/PreferencesWindow.h index d689ad53da..c120ea3404 100644 --- a/src/preferences/cpufrequency/PreferencesWindow.h +++ b/src/preferences/cpufrequency/PreferencesWindow.h @@ -19,6 +19,8 @@ #endif #include +#include +#include #include #include #include @@ -38,6 +40,7 @@ #include #include +#define TR_CONTEXT "Pref Window" // messages PrefFileWatcher const uint32 kUpdatedPreferences = '&UdP'; @@ -331,12 +334,12 @@ PreferencesWindow::PreferencesWindow(const char* title, fPreferencesView(NULL) { BGroupView* buttonView = new BGroupView(B_HORIZONTAL); - fDefaultButton = new BButton("Defaults", + fDefaultButton = new BButton(TR("Defaults"), new BMessage(kDefaultMsg)); buttonView->AddChild(fDefaultButton); buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateHorizontalStrut(7)); - fRevertButton = new BButton("Revert", new BMessage(kRevertMsg)); + fRevertButton = new BButton(TR("Revert"), new BMessage(kRevertMsg)); fRevertButton->SetEnabled(false); buttonView->AddChild(fRevertButton); diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp index becddfe05a..be8b870e7f 100644 --- a/src/preferences/cpufrequency/StatusView.cpp +++ b/src/preferences/cpufrequency/StatusView.cpp @@ -12,8 +12,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -22,6 +24,8 @@ #include "CPUFrequencyView.h" +#define TR_CONTEXT "Status view" + extern "C" _EXPORT BView *instantiate_deskbar_item(void); @@ -190,18 +194,18 @@ FrequencyMenu::FrequencyMenu(BMenu* menu, BHandler* target, fStorage(storage), fInterface(interface) { - fDynamicPerformance = new BMenuItem("Dynamic Performance", + fDynamicPerformance = new BMenuItem(TR("Dynamic Performance"), new BMessage(kMsgPolicyDynamic)); - fHighPerformance = new BMenuItem("High Performance", + fHighPerformance = new BMenuItem(TR("High Performance"), new BMessage(kMsgPolicyPerformance)); - fLowEnergie = new BMenuItem("Low Energy", + fLowEnergie = new BMenuItem(TR("Low Energy"), new BMessage(kMsgPolicyLowEnergy)); menu->AddItem(fDynamicPerformance); menu->AddItem(fHighPerformance); menu->AddItem(fLowEnergie); - fCustomStateMenu = new BMenu("Set State"); + fCustomStateMenu = new BMenu(TR("Set State")); StateList* stateList = fInterface->GetCpuFrequencyStates(); for (int i = 0; i < stateList->CountItems(); i++) { @@ -397,9 +401,9 @@ StatusView::~StatusView() void StatusView::_AboutRequested() { - BAlert *alert = new BAlert("about", "CPU Frequency\n" + BAlert *alert = new BAlert("about", TR("CPU Frequency\n" "\twritten by Clemens Zeidler\n" - "\tCopyright 2009, Haiku, Inc.\n", "Ok"); + "\tCopyright 2009, Haiku, Inc.\n"), TR("Ok")); BTextView *view = alert->TextView(); BFont font; @@ -479,7 +483,7 @@ StatusView::AttachedToWindow() fPreferencesMenu->SetFont(be_plain_font); fPreferencesMenu->AddSeparatorItem(); - fOpenPrefItem = new BMenuItem("Open Speedstep Preferences" B_UTF8_ELLIPSIS, + fOpenPrefItem = new BMenuItem(TR("Open Speedstep Preferences" B_UTF8_ELLIPSIS), new BMessage(kMsgOpenSSPreferences)); fPreferencesMenu->AddItem(fOpenPrefItem); fOpenPrefItem->SetTarget(this); @@ -649,8 +653,8 @@ StatusView::_OpenPreferences() ret = be_roster->ActivateApp(info.team); } if (ret < B_OK) { - BString errorMessage("Launching the CPU Frequency preflet failed.\n\n" - "Error: "); + BString errorMessage(TR("Launching the CPU Frequency preflet failed.\n\n" + "Error: ")); errorMessage << strerror(ret); BAlert* alert = new BAlert("launch error", errorMessage.String(), "Ok"); diff --git a/src/preferences/cpufrequency/fr.catkeys b/src/preferences/cpufrequency/fr.catkeys new file mode 100644 index 0000000000..56dea2fc2c --- /dev/null +++ b/src/preferences/cpufrequency/fr.catkeys @@ -0,0 +1,18 @@ +1 french x-vnd.Haiku-CPUFrequencyPref 1947607562 +Ok Status view Ok +Integration Time [ms] CPU Frequency View Temps d'intégration [ms] +High Performance Status view Haute performance +CPU Frequency Status View CPU Frequency View État de la fréquence du processeur +Dynamic Performance Status view Performance dynamique +Step up by CPU usage: Color Step View Accélération par utilisation processeur: +Stepping Policy CPU Frequency View Attitude d'accélération +Set State Status view Changer l'état +Open Speedstep PreferencesxE2x80xA6 Status view Préférences speedstepxE2x80xA6 +Launching the CPU Frequency preflet failed.\n\nError: Status view Échec de lancement des préférences de fréquence du processeur.\n\nErreur: +Install Replicant into Deskbar CPU Frequency View Installer le réplicant dans la Deskbar +Low Energy Status view Basse consommation +Dynamic Stepping CPU Frequency View Accélération dynamique +CPU Frequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view Fréquence du processeur\n\técrit par Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n +CPU Frequency Main window Fréquence du processeur +Defaults Pref Window Défaire +Revert Pref Window Défaire diff --git a/src/preferences/cpufrequency/main.cpp b/src/preferences/cpufrequency/main.cpp index 284e70b03f..b7d0997751 100644 --- a/src/preferences/cpufrequency/main.cpp +++ b/src/preferences/cpufrequency/main.cpp @@ -9,14 +9,21 @@ #include "PreferencesWindow.h" #include "CPUFrequencyView.h" #include +#include +#include +#define TR_CONTEXT "Main window" int main(int argc, char* argv[]) { BApplication *app = new BApplication(kPrefSignature); + + BCatalog cat; + be_locale->GetAppCatalog(&cat); + PreferencesWindow *window; - window = new PreferencesWindow("CPU Frequency", + window = new PreferencesWindow(TR("CPU Frequency"), kPreferencesFileName, kDefaultPreferences); CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350),