[haiku-commits] r40672 - in haiku/trunk/src: apps/devices apps/processcontroller preferences/touchpad
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 24 Feb 2011 20:03:48 +0100 (CET)
Author: siarzhuk
Date: 2011-02-24 20:03:47 +0100 (Thu, 24 Feb 2011)
New Revision: 40672
Changeset: http://dev.haiku-os.org/changeset/40672
Modified:
haiku/trunk/src/apps/devices/DevicesView.cpp
haiku/trunk/src/apps/devices/PropertyList.cpp
haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp
Log:
Still unlocalized strings in Process Controller, Devices and Touchpad
preferences
are localized. Pointed out by Diver. Thanks.
Modified: haiku/trunk/src/apps/devices/DevicesView.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesView.cpp 2011-02-24 18:52:07 UTC
(rev 40671)
+++ haiku/trunk/src/apps/devices/DevicesView.cpp 2011-02-24 19:03:47 UTC
(rev 40672)
@@ -285,28 +285,32 @@
// 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 @@
}
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.
Modified: haiku/trunk/src/apps/devices/PropertyList.cpp
===================================================================
--- haiku/trunk/src/apps/devices/PropertyList.cpp 2011-02-24 18:52:07 UTC
(rev 40671)
+++ haiku/trunk/src/apps/devices/PropertyList.cpp 2011-02-24 19:03:47 UTC
(rev 40672)
@@ -15,7 +15,6 @@
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "PropertyList"
-//#include <stdio.h>
PropertyRow::PropertyRow(const char* name, const char* value)
: BRow(),
Modified: haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
===================================================================
--- haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
2011-02-24 18:52:07 UTC (rev 40671)
+++ haiku/trunk/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
2011-02-24 19:03:47 UTC (rev 40672)
@@ -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;
Modified: haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp
===================================================================
--- haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp 2011-02-24
18:52:07 UTC (rev 40671)
+++ haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp 2011-02-24
19:03:47 UTC (rev 40672)
@@ -34,7 +34,10 @@
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)
:
BView(frame, "TouchpadView", B_FOLLOW_NONE, B_WILL_DRAW)
@@ -98,11 +101,11 @@
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,10 +264,7 @@
// #pragma mark - TouchpadPrefView
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TouchpadPrefView"
-
TouchpadPrefView::TouchpadPrefView()
:
BGroupView()
Other related posts:
