From 1e61f4b78205c75d9fa312944986b14e7f62ed29 Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Thu, 24 Feb 2011 19:03:47 +0000 Subject: [PATCH] Still unlocalized strings in Process Controller, Devices and Touchpad preferences are localized. Pointed out by Diver. Thanks. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40672 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/devices/DevicesView.cpp | 15 ++++++++++----- src/apps/devices/PropertyList.cpp | 1 - .../KernelMemoryBarMenuItem.cpp | 2 +- src/preferences/touchpad/TouchpadPrefView.cpp | 16 ++++++++-------- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp index 82acd97a02..cbffc7be18 100644 --- a/src/apps/devices/DevicesView.cpp +++ b/src/apps/devices/DevicesView.cpp @@ -285,28 +285,32 @@ DevicesView::AddDeviceAndChildren(device_node_cookie *node, Device* parent) // Devices Root if (attributes[i].fName == B_DEVICE_PRETTY_NAME && attributes[i].fValue == "Devices Root") { - newDevice = new Device(parent, BUS_NONE, CAT_COMPUTER, "Computer"); + newDevice = new Device(parent, BUS_NONE, + CAT_COMPUTER, B_TRANSLATE("Computer")); break; } // ACPI Controller if (attributes[i].fName == B_DEVICE_PRETTY_NAME && attributes[i].fValue == "ACPI") { - newDevice = new Device(parent, BUS_ACPI, CAT_BUS, "ACPI bus"); + newDevice = new Device(parent, BUS_ACPI, + CAT_BUS, B_TRANSLATE("ACPI bus")); break; } // PCI bus if (attributes[i].fName == B_DEVICE_PRETTY_NAME && attributes[i].fValue == "PCI") { - newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI bus"); + newDevice = new Device(parent, BUS_PCI, + CAT_BUS, B_TRANSLATE("PCI bus")); break; } // ISA bus if (attributes[i].fName == B_DEVICE_BUS && attributes[i].fValue == "isa") { - newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA bus"); + newDevice = new Device(parent, BUS_ISA, + CAT_BUS, B_TRANSLATE("ISA bus")); break; } @@ -326,7 +330,8 @@ DevicesView::AddDeviceAndChildren(device_node_cookie *node, Device* parent) } if (newDevice == NULL) { - newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown device"); + newDevice = new Device(parent, BUS_NONE, + CAT_NONE, B_TRANSLATE("Unknown device")); } // Add its attributes to the device, initialize it and add to the list. diff --git a/src/apps/devices/PropertyList.cpp b/src/apps/devices/PropertyList.cpp index 661b2e82b1..df31e7f917 100644 --- a/src/apps/devices/PropertyList.cpp +++ b/src/apps/devices/PropertyList.cpp @@ -15,7 +15,6 @@ #undef B_TRANSLATE_CONTEXT #define B_TRANSLATE_CONTEXT "PropertyList" -//#include PropertyRow::PropertyRow(const char* name, const char* value) : BRow(), diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp index b902fe7b8b..e18fd431d9 100644 --- a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp @@ -33,7 +33,7 @@ KernelMemoryBarMenuItem::KernelMemoryBarMenuItem(system_info& systemInfo) - : BMenuItem("System resources & caches" B_UTF8_ELLIPSIS, NULL) + : BMenuItem(B_TRANSLATE("System resources & caches" B_UTF8_ELLIPSIS), NULL) { fLastSum = -1; fGrenze1 = -1; diff --git a/src/preferences/touchpad/TouchpadPrefView.cpp b/src/preferences/touchpad/TouchpadPrefView.cpp index 457fc2249f..886464d983 100644 --- a/src/preferences/touchpad/TouchpadPrefView.cpp +++ b/src/preferences/touchpad/TouchpadPrefView.cpp @@ -34,6 +34,9 @@ const uint32 SCROLL_X_DRAG = 'sxdr'; const uint32 SCROLL_Y_DRAG = 'sydr'; +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "TouchpadPrefView" + TouchpadView::TouchpadView(BRect frame) : @@ -98,11 +101,11 @@ TouchpadView::MouseUp(BPoint point) int32 result = 0; if (GetRightScrollRatio() > kSoftScrollLimit || GetBottomScrollRatio() > kSoftScrollLimit) { - BAlert* alert = new BAlert("ReallyChangeScrollArea", - "The new scroll area is very large and may impede " - "normal mouse operation. Do you really want to change" - " it?", "OK", "Cancel", NULL, B_WIDTH_AS_USUAL, - B_WARNING_ALERT); + BAlert* alert = new BAlert(B_TRANSLATE("Please confirm"), + B_TRANSLATE("The new scroll area is very large and may impede " + "normal mouse operation. Do you really want to change it?"), + B_TRANSLATE("OK"), B_TRANSLATE("Cancel"), + NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); result = alert->Go(); } if (result == 0) { @@ -261,9 +264,6 @@ TouchpadView::DrawSliders() // #pragma mark - TouchpadPrefView -#undef B_TRANSLATE_CONTEXT -#define B_TRANSLATE_CONTEXT "TouchpadPrefView" - TouchpadPrefView::TouchpadPrefView() :