i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed strings in Workspaces and Devices

Browse Source 
* The GUI strings in the Devices app were inconsistent case-wise.
  Going for all sentence casing. "None" and "Unknown" look better
  as lower case, which is normally used elsewhere in Haiku.

* Workspaces usage:
  - "movement" is a bit coprolitic IMO. Let's go with "direction"
    instead.
  - "autoraise" depends on the position near the screen edge of the
    mouse pointer, not the window itself. The text could be even
    more precise, but we should try to be brief.
  - The "+|-" switch fits better to the "workspace" parameter, as it
    increases the workspace number, instead of a "movement" or
    "direction".
  - Fixed direction "top" to "up".

Change-Id: If26d2b1e0596e911fea06609c44fccff2086ca8d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/11170
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Humdinger
2026-06-25 06:51:33 +00:00
committed by Adrien Destugues
parent 3e8d044d12
commit 2b75ca9e1c
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/devices/DeviceACPI.cpp
+6 -6
View File
@@ -90,17 +90,17 @@ DeviceACPI::InitFromAttributes()
// Identify Predefined root namespaces (ACPI Spec 4.0a, p162)
if (rootACPIPath == "\\_SB_") {
deviceName = B_TRANSLATE("ACPI System Bus");
deviceName = B_TRANSLATE("ACPI system bus");
} else if (rootACPIPath == "\\_TZ_") {
deviceName = B_TRANSLATE("ACPI Thermal Zone");
deviceName = B_TRANSLATE("ACPI thermal zone");
} else if (rootACPIPath == "\\_PR_.") {
// This allows to localize apostrophes, too
BString string(B_TRANSLATE("ACPI Processor Namespace '%2'"));
BString string(B_TRANSLATE("ACPI processor namespace '%2'"));
string.ReplaceFirst("%2", nodeACPIPath);
// each CPU node is considered a root node
deviceName << string.String();
} else if (rootACPIPath == "\\_SI_") {
deviceName = B_TRANSLATE("ACPI System Indicator");
deviceName = B_TRANSLATE("ACPI system indicator");
} else if (hidDevName != NULL) {
deviceName << hidDevName;
} else if (cidDevName != NULL) {
@@ -113,7 +113,7 @@ DeviceACPI::InitFromAttributes()
} else if (nodeACPIPath == "" && nodeACPIHid != "") {
// Handle ACPI HID entries that do not return a path
nodeACPIHid.Remove(0, nodeACPIHid.FindLast("_") + 1);
BString string(B_TRANSLATE("ACPI Button '%1'"));
BString string(B_TRANSLATE("ACPI button '%1'"));
string.ReplaceFirst("%1", nodeACPIHid);
deviceName << string.String();
} else {
@@ -127,7 +127,7 @@ DeviceACPI::InitFromAttributes()
if (nodeACPIHid != "")
acpi_get_vendor_info(nodeACPIHid, &vendorName);
if (vendorName == NULL) {
manufacturerLabel << B_TRANSLATE("Unknown");
manufacturerLabel << B_TRANSLATE("unknown");
} else {
manufacturerLabel << vendorName;
};
src/apps/devices/DevicePCI.cpp
+2 -2
View File
@@ -80,7 +80,7 @@ DevicePCI::InitFromAttributes()
const char *venFull;
get_vendor_info(fVendorId, &venShort, &venFull);
if (!venShort && !venFull) {
ManufacturerName << B_TRANSLATE("Unknown");
ManufacturerName << B_TRANSLATE("unknown");
} else if (venShort && venFull) {
ManufacturerName << venFull << "(" << venShort << ")";
} else {
@@ -94,7 +94,7 @@ DevicePCI::InitFromAttributes()
get_device_info(fVendorId, fDeviceId, fSubsystemVendorId, fSubSystemId,
&devShort, &devFull);
if (!devShort && !devFull) {
DeviceName << B_TRANSLATE("Unknown");
DeviceName << B_TRANSLATE("unknown");
} else if (devShort && devFull) {
DeviceName << devFull << "(" << devShort << ")";
} else {
src/apps/devices/DeviceSCSI.cpp
+6 -6
View File
@@ -21,22 +21,22 @@
// standard SCSI device types
const char* SCSITypeMap[] = {
B_TRANSLATE("Disk Drive"), // 0x00
B_TRANSLATE("Tape Drive"), // 0x01
B_TRANSLATE("Disk drive"), // 0x00
B_TRANSLATE("Tape drive"), // 0x01
B_TRANSLATE("Printer"), // 0x02
B_TRANSLATE("Processor"), // 0x03
B_TRANSLATE("Worm"), // 0x04
B_TRANSLATE("CD-ROM"), // 0x05
B_TRANSLATE("Scanner"), // 0x06
B_TRANSLATE("Optical Drive"), // 0x07
B_TRANSLATE("Optical drive"), // 0x07
B_TRANSLATE("Changer"), // 0x08
B_TRANSLATE("Communications"), // 0x09
B_TRANSLATE("Graphics Peripheral"), // 0x0A
B_TRANSLATE("Graphics Peripheral"), // 0x0B
B_TRANSLATE("Graphics peripheral"), // 0x0A
B_TRANSLATE("Graphics peripheral"), // 0x0B
B_TRANSLATE("Array"), // 0x0C
B_TRANSLATE("Enclosure"), // 0x0D
B_TRANSLATE("RBC"), // 0x0E
B_TRANSLATE("Card Reader"), // 0x0F
B_TRANSLATE("Card reader"), // 0x0F
B_TRANSLATE("Bridge"), // 0x10
B_TRANSLATE("Other") // 0x11
};
src/apps/devices/DeviceUSB.cpp
+2 -2
View File
@@ -77,14 +77,14 @@ DeviceUSB::InitFromAttributes()
usb_get_vendor_info(fVendorId, &vendorName);
usb_get_device_info(fVendorId, fDeviceId, &deviceName);
if (vendorName == NULL) {
manufacturerLabel << B_TRANSLATE("Unknown");
manufacturerLabel << B_TRANSLATE("unknown");
} else {
manufacturerLabel << vendorName;
};
// Fetch DeviceName
if (deviceName == NULL) {
deviceLabel << B_TRANSLATE("Unknown");
deviceLabel << B_TRANSLATE("unknown");
} else {
deviceLabel << deviceName;
}
src/apps/devices/DevicesView.cpp
+2 -2
View File
@@ -412,9 +412,9 @@ DevicesView::AddDeviceAndChildren(device_node_cookie *node, Device* parent)
if (driverAttrInfo.value.string[0] != '\0')
newDevice->SetAttribute(B_TRANSLATE("Driver used"), driverAttrInfo.value.string);
else
newDevice->SetAttribute(B_TRANSLATE("Driver used"), B_TRANSLATE("Unknown"));
newDevice->SetAttribute(B_TRANSLATE("Driver used"), B_TRANSLATE("unknown"));
if (!hasPublishedPath)
newDevice->SetAttribute(B_TRANSLATE("Device paths"), B_TRANSLATE("None"));
newDevice->SetAttribute(B_TRANSLATE("Device paths"), B_TRANSLATE("none"));
newDevice->InitFromAttributes();
fDevices.push_back(newDevice);
src/apps/devices/ResourceUsageWindow.cpp
+4 -4
View File
@@ -189,8 +189,8 @@ RangeItem::Compare(const void *firstArg, const void *secondArg)
// ResourceUsageWindow - Constructor
ResourceUsageWindow::ResourceUsageWindow(BRect frame, BList &list)
: BWindow (frame, B_TRANSLATE("Resource Usage"), B_TITLED_WINDOW_LOOK,
B_NORMAL_WINDOW_FEEL , B_NOT_ZOOMABLE|B_NOT_RESIZABLE)
: BWindow (frame, B_TRANSLATE("Resource usage"), B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
B_NOT_ZOOMABLE|B_NOT_RESIZABLE)
{
InitWindow(list);
CenterOnScreen();
@@ -258,10 +258,10 @@ void ResourceUsageWindow::InitWindow(BList &list)
tab->SetLabel(B_TRANSLATE("DMA"));
tab = new BTab();
tabView->AddTab(IORangeScrollView, tab);
tab->SetLabel(B_TRANSLATE("IO Range"));
tab->SetLabel(B_TRANSLATE("I/O range"));
tab = new BTab();
tabView->AddTab(memoryScrollView, tab);
tab->SetLabel(B_TRANSLATE("Memory Range"));
tab->SetLabel(B_TRANSLATE("Memory range"));
{
uint32 mask = 1;
src/apps/workspaces/Workspaces.cpp
+5 -5
View File
@@ -1018,7 +1018,7 @@ WorkspacesApp::AboutRequested()
void
WorkspacesApp::Usage(const char *programName)
{
printf(B_TRANSLATE("Usage: %s [options] [workspace|movement]\n"
printf(B_TRANSLATE("Usage: %s [options] [workspace|direction]\n"
"where \"options\" are:\n"
" --notitle\t\ttitle bar removed, border and resize kept\n"
" --noborder\t\ttitle, border, and resize removed\n"
@@ -1026,13 +1026,13 @@ WorkspacesApp::Usage(const char *programName)
"keyboard events\n"
" --alwaysontop\t\tkeeps window on top\n"
" --notmovable\t\twindow can't be moved around\n"
" --autoraise\t\tauto-raise the workspace window when it's at the "
" --autoraise\t\tauto-raise the workspace window when mouse is at the "
"screen edge\n"
" --help\t\tdisplay this help and exit\n"
" -i\t\t\tdisplay workspace layout and exit\n"
"\"workspace\" is the number of the Workspace to which to switch (0-31)\n"
"and \"movement\" is the move to find the Workspace to which to switch "
"(+|-left|right|top|down)\n"),
"\"workspace\" is the number of the Workspace to which to switch (+|-|0-31)\n"
"and \"direction\" is the direction of the Workspace to switch to "
"(left|right|up|down)\n"),
programName);
// quit only if we aren't running already