Ticket #5928: installedpackages.patch

src/apps/installedpackages/UninstallWindow.cpp

@@ -20 +20 @@
 
 UninstallWindow::UninstallWindow()
     :
-    BWindow(BRect(100, 100, 600, 300), TR("Installed packages"),
+    BWindow(BRect(100, 100, 600, 300), B_TRANSLATE("Installed packages"),
         B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_QUIT_ON_WINDOW_CLOSE
             | B_AUTO_UPDATE_SIZE_LIMITS)
 {

src/apps/installedpackages/UninstallView.cpp

@@ -82 +82 @@
     :
     BGroupView(B_VERTICAL)
 {
-    fNoPackageSelectedString = TR("No package selected.");
+    fNoPackageSelectedString = B_TRANSLATE("No package selected.");
     _InitView();
 }
 
@@ -159 +159 @@
                 if (fWatcherRunning) {
                     _AddFile(filename.String(), ref);
                 } else {
-                    // This most likely means we were waiting for 
+                    // This most likely means we were waiting for
                     // the packages/ dir to appear
                     if (filename == "packages") {
                         if (watch_node(&ref, B_WATCH_DIRECTORY, this) == B_OK)
@@ -246 +246 @@
                 fDescription->SetText(fNoPackageSelectedString);
 
                 notify = new BAlert("removal_success",
-                    TR("The package you selected has been successfully removed "
-                    "from your system."), TR("OK"));
+                    B_TRANSLATE("The package you selected has been "
+                    "successfully removed from your system."),
+                    B_TRANSLATE("OK"));
             } else {
                 notify = new BAlert("removal_failed",
-                    TR("The selected package was not removed from your system. "
-                    "The given installed package information file might have "
-                    "been corrupted."), TR("OK"), NULL, 
-                    NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                    B_TRANSLATE("The selected package was not removed from "
+                    "your system. The given installed package information "
+                    "file might have been corrupted."), B_TRANSLATE("OK"),
+                    NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             }
 
             notify->Go();
@@ -276 +277 @@
         0, false, true, B_NO_BORDER);
 
     BStringView* descriptionLabel = new BStringView("desc_label",
-        TR("Package description"));
+        B_TRANSLATE("Package description"));
     descriptionLabel->SetFont(be_bold_font);
 
     fDescription = new BTextView("description", B_WILL_DRAW);
@@ -285 +286 @@
     fDescription->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     fDescription->SetText(fNoPackageSelectedString);
 
-    fButton = new BButton("removal", TR("Remove"), new BMessage(P_MSG_REMOVE));
+    fButton = new BButton("removal", B_TRANSLATE("Remove"),
+        new BMessage(P_MSG_REMOVE));
     fButton->SetEnabled(false);
 
     const float spacing = be_control_look->DefaultItemSpacing();

src/apps/installedpackages/main.cpp

@@ -29 +29 @@
 public:
     UninstallApplication();
     ~UninstallApplication();
-    
+
     void AboutRequested();
 
 private:
@@ -58 +58 @@
 void
 UninstallApplication::AboutRequested()
 {
-    BString aboutString = TR("InstalledPackages");
+    BString aboutString = B_TRANSLATE("InstalledPackages");
     int appNameLength = aboutString.Length();
     aboutString << "\n";
-    aboutString << TR("BeOS legacy .pkg package removing application "
+    aboutString << B_TRANSLATE("BeOS legacy .pkg package removing application "
         "for Haiku.\n\n"
         "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n"
         "Copyright (c) 2007 Haiku, Inc.\n");
-    BAlert* about = new BAlert("about", aboutString.String(), TR("Close"));
+    BAlert* about = new BAlert("about", aboutString.String(),
+        B_TRANSLATE("Close"));
 
     BTextView* view = about->TextView();
     BFont font;