Ticket #7111: devices-localization-update.patch

src/apps/devices/Device.cpp

@@ -108 +108 @@
 Device::GetBasicStrings()
 {
     BString str;
-    str << B_TRANSLATE("Device Name\t\t\t\t: ") << GetName() << "\n";
-    str << B_TRANSLATE("Manufacturer\t\t\t: ") << GetManufacturer() << "\n";
-    str << B_TRANSLATE("Driver used\t\t\t\t: ") << GetDriverUsed() << "\n";
-    str << B_TRANSLATE("Device paths\t: ") << GetDevPathsPublished();
+    str << B_TRANSLATE("Device Name") << "\t\t\t\t: " << GetName() << "\n";
+    str << B_TRANSLATE("Manufacturer") << "\t\t\t: " << GetManufacturer() << "\n";
+    str << B_TRANSLATE("Driver used") << "\t\t\t\t: " << GetDriverUsed() << "\n";
+    str << B_TRANSLATE("Device paths") << "\t: " << GetDevPathsPublished();
     return str;
 }
 
 BString
 Device::GetBusStrings()
 {
-    return "None";
+    return B_TRANSLATE("None");
 }
 
 

src/apps/devices/ResourceUsageWindow.cpp

@@ -189 +189 @@
 
 // ResourceUsageWindow - Constructor
 ResourceUsageWindow::ResourceUsageWindow(BRect frame, BList &list) 
-    : BWindow (frame, "Resource Usage", B_TITLED_WINDOW_LOOK,
+    : BWindow (frame, B_TRANSLATE("Resource Usage"), B_TITLED_WINDOW_LOOK,
         B_NORMAL_WINDOW_FEEL , B_NOT_ZOOMABLE|B_NOT_RESIZABLE)
 {
     InitWindow(list);

src/apps/devices/DevicesApplication.cpp

@@ -53 +53 @@
 void
 DevicesApplication::ShowAbout()
 {
-    BAlert* alert = new BAlert(B_TRANSLATE("about"), B_TRANSLATE("Devices\n"
+    BAlert* alert = new BAlert("about", B_TRANSLATE("Devices\n"
         "\twritten by Pieter Panman\n"
         "\n"
         "\tBased on listdev by Jérôme Duval\n"
         "\tand the previous Devices preference\n"
         "\tby Jérôme Duval and Sikosis\n"
-        "\tCopyright 2009, Haiku, Inc.\n"), "OK");
+        "\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
     BTextView* view = alert->TextView();
     BFont font;
 
@@ -76 +76 @@
 
 DevicesWindow::DevicesWindow()
     :
-    BWindow(BRect(50, 50, 750, 550), "Devices", B_TITLED_WINDOW,
-        B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
-            | B_QUIT_ON_WINDOW_CLOSE)
+    BWindow(BRect(50, 50, 750, 550), B_TRANSLATE("Devices"), 
+        B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS 
+        | B_AUTO_UPDATE_SIZE_LIMITS
+        | B_QUIT_ON_WINDOW_CLOSE)
 {
     float minWidth;
     float maxWidth;

src/apps/devices/Jamfile

@@ -76 +76 @@
     : Devices.rdef
 ;
 
+DoCatalogs Devices :
+    x-vnd.Haiku-Devices
+    :
+    DevicesApplication.cpp
+    DevicesView.cpp
+    DevicePCI.cpp
+    PropertyList.cpp
+    PropertyListPlain.cpp
+;
+
 Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h
     usbdevs_data.h ] ;
 Includes [ FGristFiles ConfigurationWindow.cpp ] : [ FGristFiles pcihdr.h ] ;

src/apps/devices/DevicePCI.cpp

@@ -19 +19 @@
 }
 
 
-
 DevicePCI::DevicePCI(Device* parent)
     :
     Device(parent),
@@ -76 +75 @@
     const char *venFull;
     get_vendor_info(fVendorId, &venShort, &venFull);
     if (!venShort && !venFull) {
-        ManufacturerName << "Unknown";
+        ManufacturerName << B_TRANSLATE("Unknown");
     } else if (venShort && venFull) {
         ManufacturerName << venFull << "(" << venShort << ")";
     } else {
@@ -90 +89 @@
     get_device_info(fVendorId, fDeviceId, fSubsystemVendorId, fSubSystemId,
         &devShort, &devFull);
     if (!devShort && !devFull) {
-        DeviceName << "Unknown";
+        DeviceName << B_TRANSLATE("Unknown");
     } else if (devShort && devFull) {
         DeviceName << devFull << "(" << devShort << ")";
     } else {
@@ -126 +125 @@
 DevicePCI::GetBusStrings()
 {
     BString str;
-    str << "Class Info:\t\t\t\t: " << fAttributeMap["Class Info"];
+    str << B_TRANSLATE("Class Info:") << "\t\t\t\t: " 
+        << fAttributeMap["Class Info"];
     return str;
 }

src/apps/devices/DeviceACPI.cpp

@@ -48 +48 @@
     } else if (rootACPIPath == "\\_TZ_") {
         outlineName = B_TRANSLATE("ACPI Thermal Zone");
     } else if (rootACPIPath == "\\_PR_.") {
+        /* This allows to localize apostrophes, too */
+        BString str0(B_TRANSLATE("ACPI Processor Namespace '%2'"));
+        str0.ReplaceFirst("%2", nodeACPIPath);
         // each CPU node is considered a root node
-        outlineName << B_TRANSLATE("ACPI Processor Namespace '")
-            << nodeACPIPath << "'";
+        outlineName << str0.String();
     } else if (rootACPIPath == "\\_SI_") {
         outlineName = B_TRANSLATE("ACPI System Indicator");
     } else {
-        outlineName << B_TRANSLATE("ACPI node '") << nodeACPIPath << "'";
+        /* This allows to localize apostrophes, too */
+        BString str1(B_TRANSLATE("ACPI node '%1'"));
+        str1.ReplaceFirst("%1", nodeACPIPath);
+        outlineName << str1.String();
     }
 
     SetAttribute(B_TRANSLATE("Device name"), outlineName.String());
-    SetAttribute(B_TRANSLATE("Manufacturer"), B_TRANSLATE("Not implimented"));
+    SetAttribute(B_TRANSLATE("Manufacturer"), B_TRANSLATE("Not implemented"));
 
     SetText(outlineName.String());
 }
@@ -80 +85 @@
 DeviceACPI::GetBusStrings()
 {
     BString str;
-    str << "Class Info:\t\t\t\t: " << fAttributeMap["Class Info"];
+    str << B_TRANSLATE("Class Info:") << "\t\t\t\t: " << fAttributeMap["Class Info"];
     return str;
 }