Ticket #5907: packageinstallerLocalization.2.patch

src/apps/packageinstaller/PackageStatus.cpp

@@ -10 +10 @@
 #include "PackageStatus.h"
 
 #include <Autolock.h>
-
+#include <Catalog.h>
 #include <GroupLayoutBuilder.h>
 #include <GroupLayout.h>
+#include <Locale.h>
 
 #include <stdio.h>
 #include <string.h>
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageStatus"
 
-
 StopButton::StopButton()
-    :   BButton(BRect(0, 0, 22, 18), "stop", "", new BMessage(P_MSG_STOP))
+    :   BButton(BRect(0, 0, 22, 18), "stop", TR("Stop"), new BMessage(P_MSG_STOP))
 {
 }
 
@@ -100 +100 @@
 {
     SetLayout(new BGroupLayout(B_VERTICAL));
 
-    fStatus = new BStatusBar("status_bar", T("Installing package"));
+    fStatus = new BStatusBar("status_bar", TR("Installing package"));
     fStatus->SetBarHeight(12);
 
     fButton = new StopButton();

src/apps/packageinstaller/PackageInfo.cpp

@@ -11 +11 @@
 
 #include <Alert.h>
 #include <ByteOrder.h>
+#include <Catalog.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <Path.h>
 #include <kernel/OS.h>
 
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageInfo"
 
 #define RETURN_AND_SET_STATUS(err) fStatus = err; \
-    fprintf(stderr, "err at %s():%d: %x\n", __FUNCTION__, __LINE__, err); \
+    fprintf(stderr, TR("err at %s():%d: %x\n"), __FUNCTION__, __LINE__, err); \
     return fStatus;
 
 const uint32 kSkipOffset = 33;
@@ -48 +50 @@
     :
     fStatus(B_NO_INIT),
     fPackageFile(0),
-    fDescription(T("No package available.")),
+    fDescription(TR("No package available.")),
     fProfiles(2),
     fHasImage(false)
 {
@@ -59 +61 @@
     :
     fStatus(B_NO_INIT),
     fPackageFile(new BFile(ref, B_READ_ONLY)),
-    fDescription(T("No package selected.")),
+    fDescription(TR("No package selected.")),
     fProfiles(2),
     fHasImage(false)
 {
@@ -1027 +1029 @@
             parser_debug("PtcI\n");
             break;
         } else {
-            fprintf(stderr, "Unknown file tag %s\n", buffer);
+            fprintf(stderr, TR("Unknown file tag %s\n"), buffer);
             RETURN_AND_SET_STATUS(B_ERROR);
         }
     }
@@ -1035 +1037 @@
     if (static_cast<uint64>(actualSize) != fileSize) {
         // Inform the user of a possible error
         int32 selection;
-        BAlert *warning = new BAlert(T("filesize_wrong"),
-            T("There seems to be a file size mismatch in the package file. "
+        BAlert *warning = new BAlert("filesize_wrong",
+            TR("There seems to be a file size mismatch in the package file. "
                 "The package might be corrupted or have been modified after its "
-                "creation. Do you still wish to continue?"), T("Continue"),
-                T("Abort"), NULL,
+                "creation. Do you still wish to continue?"), TR("Continue"),
+                TR("Abort"), NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         selection = warning->Go();
 

src/apps/packageinstaller/PackageItem.cpp

@@ -13 +13 @@
 
 #include <Alert.h>
 #include <ByteOrder.h>
+#include <Catalog.h>
 #include <Directory.h>
 #include <fs_info.h>
+#include <Locale.h>
 #include <NodeInfo.h>
 #include <OS.h>
 #include <SymLink.h>
@@ -22 +24 @@
 
 #include "zlib.h"
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageItem"
 
-// Macro reserved for later localization
-#define T(x) x
-
 enum {
     P_CHUNK_SIZE = 256
 };
@@ -561 +562 @@
 }
 
 
-const char*
+const uint32 
 PackageScript::ItemKind()
 {
-    return "script";
+    return P_KIND_SCRIPT;
 }
 
 
@@ -737 +738 @@
 }
 
 
-const char*
+const uint32 
 PackageDirectory::ItemKind()
 {
-    return "directory";
+    return P_KIND_DIRECTORY;
 }
 
 
@@ -903 +904 @@
 }
 
 
-const char*
+const uint32 
 PackageFile::ItemKind()
 {
-    return "file";
+    return P_KIND_FILE;
 }
 
 
@@ -1038 +1039 @@
 }
 
 
-const char*
+const uint32 
 PackageLink::ItemKind()
 {
-    return "symbolic link";
+    return P_KIND_SYM_LINK;
 }
+

src/apps/packageinstaller/PackageItem.h

@@ -42 +42 @@
     P_EXISTS_NONE
 };
 
+const uint32 P_NO_KIND = 0;
+const uint32 P_KIND_SCRIPT = 1;
+const uint32 P_KIND_FILE = 2;
+const uint32 P_KIND_DIRECTORY = 3;
+const uint32 P_KIND_SYM_LINK = 4;
+
 extern status_t inflate_data(uint8* in, uint32 inSize, uint8* out,
     uint32 outSize);
 
@@ -77 +83 @@
     virtual void            SetTo(BFile* parent, const BString& path,
                                 uint8 type, uint32 ctime, uint32 mtime,
                                 uint64 offset = 0, uint64 size = 0);
-    virtual const char*     ItemKind() = 0;
+    virtual const uint32    ItemKind() {return P_NO_KIND;};
 
     protected:
             status_t        InitPath(const char* path, BPath* destination);
@@ -115 +121 @@
 
     virtual status_t        DoInstall(const char* path = NULL,
                                 ItemState *state = NULL);
-    virtual const char*     ItemKind();
+    virtual const uint32    ItemKind();
 };
 
 
@@ -126 +132 @@
 
     virtual status_t        DoInstall(const char* path = NULL,
                                 ItemState *state = NULL);
-    virtual const char*     ItemKind();
+    virtual const uint32    ItemKind();
 
             thread_id       GetThreadId() { return fThreadId; }
             void            SetThreadId(thread_id id) { fThreadId = id; }
@@ -151 +157 @@
 
     virtual status_t        DoInstall(const char* path = NULL,
                                 ItemState *state = NULL);
-    virtual const char*     ItemKind();
+    virtual const uint32    ItemKind();
 
 private:
             uint64          fOriginalSize;
@@ -172 +178 @@
 
     virtual status_t        DoInstall(const char* path = NULL,
                                 ItemState *state = NULL);
-    virtual const char*     ItemKind();
+    virtual const uint32    ItemKind();
 
 private:
             uint32          fMode;

src/apps/packageinstaller/PackageImageViewer.cpp

@@ -10 +10 @@
 #include "PackageImageViewer.h"
 
 #include <BitmapStream.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <Message.h>
 #include <Screen.h>
 #include <TranslatorRoster.h>
 
 
-// Reserved
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageImageViewer"
 
-
 enum {
     P_MSG_CLOSE = 'pmic'
 };
@@ -81 +82 @@
     if (fSuccess)
         DrawBitmapAsync(fImage, Bounds());
     else {
-        float length = StringWidth(T("Image not loaded correctly"));
-        DrawString(T("Image not loaded correctly"), 
+        float length = StringWidth(TR("Image not loaded correctly"));
+        DrawString(TR("Image not loaded correctly"), 
             BPoint((Bounds().Width() - length) / 2.0f, 30.0f));
     }
 }

src/apps/packageinstaller/PackageInstall.cpp

@@ -14 +14 @@
 #include "PackageView.h"
 
 #include <Alert.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <stdio.h>
 
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageInstall"
 
 static int32 install_function(void *data)
 {
@@ -106 +108 @@
     PackageStatus *progress = fParent->GetStatusWindow();
     progress->Reset(n + m + 5);
 
-    progress->StageStep(1, T("Preparing package"));
+    progress->StageStep(1, TR("Preparing package"));
 
     InstalledPackageInfo packageInfo(info->GetName(), info->GetVersion());
 
@@ -114 +116 @@
     if (err == B_OK) {
         // The package is already installed, inform the user
         BAlert *reinstall = new BAlert("reinstall",
-            T("The given package seems to be already installed on your system. "
+            TR("The given package seems to be already installed on your system. "
                 "Would you like to uninstall the existing one and continue the "
-                "installation?"), T("Continue"), T("Abort"));
+                "installation?"), TR("Continue"), TR("Abort"));
 
         if (reinstall->Go() == 0) {
             // Uninstall the package
             err = packageInfo.Uninstall();
             if (err != B_OK) {
-                fprintf(stderr, "Error on uninstall\n");
+                fprintf(stderr, TR("Error on uninstall\n"));
                 return P_MSG_I_ERROR;
             }
 
             err = packageInfo.SetTo(info->GetName(), info->GetVersion(), true);
             if (err != B_OK) {
-                fprintf(stderr, "Error on SetTo\n");
+                fprintf(stderr, TR("Error on SetTo\n"));
                 return P_MSG_I_ERROR;
             }
         } else {
@@ -138 +140 @@
     } else if (err == B_ENTRY_NOT_FOUND) {
         err = packageInfo.SetTo(info->GetName(), info->GetVersion(), true);
         if (err != B_OK) {
-            fprintf(stderr, "Error on SetTo\n");
+            fprintf(stderr, TR("Error on SetTo\n"));
             return P_MSG_I_ERROR;
         }
     } else if (progress->Stopped()) {
         return P_MSG_I_ABORT;
     } else {
-        fprintf(stderr, "returning on error\n");
+        fprintf(stderr, TR("returning on error\n"));
         return P_MSG_I_ERROR;
     }
 
-    progress->StageStep(1, T("Installing files and folders"));
+    progress->StageStep(1, TR("Installing files and folders"));
 
     // Install files and directories
     PackageItem *iter;
@@ -189 +191 @@
         }
 
         if (err != B_OK) {
-            fprintf(stderr, "Error while writing path\n");
+            fprintf(stderr, TR("Error while writing path\n"));
             return P_MSG_I_ERROR;
         }
 
@@ -202 +204 @@
         packageInfo.AddItem(state.destination.Path());
     }
 
-    progress->StageStep(1, T("Running post-installation scripts"), "");
+    progress->StageStep(1, TR("Running post-installation scripts"), "");
 
     PackageScript *scr;
     status_t status;
@@ -214 +216 @@
         fCurrentScript = scr;
 
         if (scr->DoInstall() != B_OK) {
-            fprintf(stderr, "Error while running script\n");
+            fprintf(stderr, TR("Error while running script\n"));
             return P_MSG_I_ERROR;
         }
         fCurrentScriptLocker.Unlock();
@@ -232 +234 @@
         progress->StageStep(1, NULL, label.String());
     }
 
-    progress->StageStep(1, T("Finishing installation"), "");
+    progress->StageStep(1, TR("Finishing installation"), "");
 
     err = packageInfo.Save();
     if (err != B_OK)
         return P_MSG_I_ERROR;
 
-    progress->StageStep(1, T("Done"));
+    progress->StageStep(1, TR("Done"));
 
     // Inform our parent that we finished
     return P_MSG_I_FINISHED;

src/apps/packageinstaller/PackageTextViewer.cpp

@@ -10 +10 @@
 #include "PackageTextViewer.h"
 
 #include <Button.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <ScrollView.h>
 
 #include <GroupLayout.h>
@@ -21 +23 @@
     P_MSG_DECLINE
 };
 
-// Reserved
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageTextViewer"
 
 
 PackageTextViewer::PackageTextViewer(const char *text, bool disclaimer)
-    :   BWindow(BRect(125, 125, 675, 475), T("Disclaimer"), B_MODAL_WINDOW,
+    :   BWindow(BRect(125, 125, 675, 475), TR("Disclaimer"), B_MODAL_WINDOW,
             B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_NOT_CLOSABLE),
         fValue(0)
 {
@@ -115 +117 @@
     BRect bounds;
     BRect rect = Bounds();
     if (disclaimer) {
-        BButton *button = new BButton(BRect(0, 0, 1, 1), "accept", T("Accept"),
+        BButton *button = new BButton(BRect(0, 0, 1, 1), "accept", TR("Accept"),
                 new BMessage(P_MSG_ACCEPT));
         button->ResizeToPreferred();
 
@@ -128 +130 @@
         button->MakeDefault(true);
         fBackground->AddChild(button);
 
-        button = new BButton(BRect(0, 0, 1, 1), "decline", T("Decline"),
+        button = new BButton(BRect(0, 0, 1, 1), "decline", TR("Decline"),
                 new BMessage(P_MSG_DECLINE));
         button->ResizeToPreferred();
 
@@ -138 +140 @@
         fBackground->AddChild(button);
     }
     else {
-        BButton *button = new BButton(BRect(0, 0, 1, 1), "accept", T("Continue"),
+        BButton *button = new BButton(BRect(0, 0, 1, 1), "accept", TR("Continue"),
                 new BMessage(P_MSG_ACCEPT));
         button->ResizeToPreferred();
 
@@ -184 +186 @@
             B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true);
 
     if (disclaimer) {
-        BButton *accept = new BButton("accept", T("Accept"),
+        BButton *accept = new BButton("accept", TR("Accept"),
                 new BMessage(P_MSG_ACCEPT));
 
-        BButton *decline = new BButton("decline", T("Decline"),
+        BButton *decline = new BButton("decline", TR("Decline"),
                 new BMessage(P_MSG_DECLINE));
 
         fBackground = BGroupLayoutBuilder(B_VERTICAL)
@@ -199 +201 @@
             .End();
     }
     else {
-        BButton *button = new BButton("accept", T("Continue"),
+        BButton *button = new BButton("accept", TR("Continue"),
                 new BMessage(P_MSG_ACCEPT));
 
         fBackground = BGroupLayoutBuilder(B_VERTICAL)

src/apps/packageinstaller/PackageWindow.cpp

@@ -10 +10 @@
 #include "PackageWindow.h"
 
 #include <Application.h>
-
+#include <Catalog.h>
 #include <GroupLayout.h>
+#include <Locale.h>
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageWindow"
 
-
 PackageWindow::PackageWindow(const entry_ref *ref)
-    :   BWindow(BRect(100, 100, 600, 300), T("PackageInstaller"), B_TITLED_WINDOW,
-            B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
+    :   BWindow(BRect(100, 100, 600, 300), TR("PackageInstaller"), 
+        B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
 {
     //SetLayout(new BGroupLayout(B_HORIZONTAL));
 

src/apps/packageinstaller/main.cpp

@@ -9 +9 @@
 
 #include "PackageWindow.h"
 
+#include <Alert.h>
 #include <Application.h>
+#include <Autolock.h>
+#include <Catalog.h>
+#include <Entry.h>
 #include <FilePanel.h>
 #include <List.h>
-#include <Alert.h>
+#include <Locale.h>
 #include <TextView.h>
-#include <Entry.h>
-#include <Autolock.h>
+
 #include <stdio.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "Packageinstaller main"
 
 class PackageInstaller : public BApplication {
     public:
@@ -33 +38 @@
         void AboutRequested();
 
     private:
-        BFilePanel *fOpen;
-        uint32 fWindowCount;
+        BFilePanel  *fOpen;
+        uint32      fWindowCount;
+        BCatalog    fAppCatalog;
 };
 
 
 PackageInstaller::PackageInstaller()
     :   BApplication("application/x-vnd.Haiku-PackageInstaller"),
-    fWindowCount(0)
+    fOpen(NULL),
+    fWindowCount(0),
+    fAppCatalog(NULL)
 {
     fOpen = new BFilePanel(B_OPEN_PANEL);
+    be_locale->GetAppCatalog(&fAppCatalog);
 }
 
 
@@ -94 +103 @@
     
     for (i = 1; i < argc; i++) {
         if (path.SetTo(argv[i]) != B_OK) {
-            fprintf(stderr, "Error! \"%s\" is not a valid path.\n", argv[i]);
+            fprintf(stderr, TR("Error! \"%s\" is not a valid path.\n"), argv[i]);
             continue;
         }
         
         ret = get_ref_for_path(path.Path(), &ref);
         if (ret != B_OK) {
-            fprintf(stderr, "Error (%s)! Could not open \"%s\".\n", strerror(ret), 
+            fprintf(stderr, TR("Error (%s)! Could not open \"%s\".\n"), strerror(ret), 
                     argv[i]);
             continue;
         }
@@ -135 +144 @@
 PackageInstaller::AboutRequested()
 {
     BAlert *about = new BAlert("about",
-        "PackageInstaller\n"
+        TR("PackageInstaller\n"
         "BeOS legacy .pkg file installer for Haiku.\n\n"
         "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n"
-        "Copyright (c) 2007 Haiku, Inc. \n",
-        "OK");
+        "Copyright (c) 2007 Haiku, Inc. \n"),
+        TR("OK"));
 
     BTextView *view = about->TextView();
     BFont font;

src/apps/packageinstaller/PackageView.cpp

@@ -14 +14 @@
 
 #include <Alert.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <Directory.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <Path.h>
 #include <PopUpMenu.h>
@@ -32 +34 @@
 #include <fs_info.h>
 #include <stdio.h> // For debugging
 
-// Macro reserved for later localization
-#define T(x) x
+#undef TR_CONTEXT
+#define TR_CONTEXT "PackageView"
 
 const float kMaxDescHeight = 125.0f;
 const uint32 kSeparatorIndex = 3;
 
 
-
 static void
 convert_size(uint64 size, char *buffer, uint32 n)
 {
     if (size < 1024)
-        snprintf(buffer, n, "%llu bytes", size);
+        snprintf(buffer, n, TR("%llu bytes"), size);
     else if (size < 1024 * 1024)
-        snprintf(buffer, n, "%.1f KiB", size / 1024.0f);
+        snprintf(buffer, n, TR("%.1f KiB"), size / 1024.0f);
     else if (size < 1024 * 1024 * 1024)
-        snprintf(buffer, n, "%.1f MiB", size / (1024.0f*1024.0f));
+        snprintf(buffer, n, TR("%.1f MiB"), size / (1024.0f*1024.0f));
     else
-        snprintf(buffer, n, "%.1f GiB", size / (1024.0f*1024.0f*1024.0f));
+        snprintf(buffer, n, TR("%.1f GiB"), size / (1024.0f*1024.0f*1024.0f));
 }
 
 
@@ -88 +89 @@
 {
     status_t ret = fInfo.InitCheck();
     if (ret != B_OK && ret != B_NO_INIT) {
-        BAlert *warning = new BAlert(T("parsing_failed"),
-                T("The package file is not readable.\nOne of the possible "
+        BAlert *warning = new BAlert("parsing_failed",
+                TR("The package file is not readable.\nOne of the possible "
                 "reasons for this might be that the requested file is not a valid "
-                "BeOS .pkg package."), T("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
+                "BeOS .pkg package."), TR("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
                 B_WARNING_ALERT);
         warning->Go();
 
@@ -104 +105 @@
     BString title;
     BString name = fInfo.GetName();
     if (name.CountChars() == 0) {
-        title = T("Package installer");
+        title = TR("Package installer");
     }
     else {
-        title = T("Install ");
+        title = TR("Install ");
         title += name;
     }
     parent->SetTitle(title.String());
@@ -122 +123 @@
         // attaching the view to the window
         _GroupChanged(0);
 
-        fStatusWindow = new PackageStatus(T("Installation progress"), NULL, NULL,
+        fStatusWindow = new PackageStatus(TR("Installation progress"), NULL, NULL,
                 this);
 
         // Show the splash screen, if present
@@ -184 +185 @@
         case P_MSG_I_FINISHED:
         {
             BAlert *notify = new BAlert("installation_success",
-                T("The package you requested has been successfully installed "
-                    "on your system."), T("OK"));
+                TR("The package you requested has been successfully installed "
+                    "on your system."), TR("OK"));
 
             notify->Go();
             fStatusWindow->Hide();
@@ -202 +203 @@
         case P_MSG_I_ABORT:
         {
             BAlert *notify = new BAlert("installation_aborted",
-                T("The installation of the package has been aborted."), T("OK"));
+                TR("The installation of the package has been aborted."), 
+                TR("OK"));
             notify->Go();
             fStatusWindow->Hide();
             fInstall->SetEnabled(true);
@@ -214 +216 @@
         case P_MSG_I_ERROR:
         {
             BAlert *notify = new BAlert("installation_failed", // TODO: Review this
-                T("The requested package failed to install on your system. This "
-                    "might be a problem with the target package file. Please consult "
-                    "this issue with the package distributor."), T("OK"), NULL,
-                NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-            fprintf(stderr, "Error while installing the package\n");
+                TR("The requested package failed to install on your system. "
+                "This might be a problem with the target package file. Please "
+                "consult this issue with the package distributor."), 
+                TR("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            fprintf(stderr, TR("Error while installing the package\n"));
             notify->Go();
             fStatusWindow->Hide();
             fInstall->SetEnabled(true);
@@ -253 +255 @@
                     break;
 
                 BString name = path.Path();
-                char sizeString[32];
+                char sizeString[48];
 
-                convert_size(volume.FreeBytes(), sizeString, 32);
-                name << " (" << sizeString << " free)";
+                convert_size(volume.FreeBytes(), sizeString, 48);
+                char kbuffer[512];
+                snprintf(kbuffer, sizeof(kbuffer), "(%s free)", sizeString);
+                name << kbuffer;
 
                 item->SetLabel(name.String());
                 fCurrentPath.SetTo(path.Path());
@@ -300 +304 @@
         case P_EXISTS_ASK:
         case P_EXISTS_NONE:
         {
-            BString alertString = T("The ");
+            const char* formatString;
+            switch (item.ItemKind()){
+                case P_KIND_SCRIPT:
+                    formatString = TR("The script named \'%s\' already exits "
+                        "in the given path.\nReplace the script with the one "
+                        "from this package or skip it?");   
+                    break;
+                case P_KIND_FILE:
+                    formatString = TR("The file named \'%s\' already exits "
+                        "in the given path.\nReplace the file with the one "
+                        "from this package or skip it?");
+                    break;
+                case P_KIND_DIRECTORY:
+                    formatString = TR("The directory named \'%s\' already exits "
+                        "in the given path.\nReplace the directory with one "
+                        "from this package or skip it?");
+                    break;
+                case P_KIND_SYM_LINK:
+                    formatString = TR("The symbolic link named \'%s\' already "
+                        "exists in the give path.\nReplace the link with the "
+                        "one from this package or skip it?");
+                    break;
+                default:
+                    break;
+            }
+            char buffer[512];
+            snprintf(buffer, sizeof(buffer), formatString, path.Leaf());
+            
+            BString alertString = buffer;
+            
+            BAlert *alert = new BAlert("file_exists", alertString.String(),
+                TR("Replace"), TR("Skip"), TR("Abort"));
 
-            alertString << item.ItemKind() << T(" named \'") << path.Leaf() << "\' ";
-            alertString << T("already exists in the given path.\nReplace the file with "
-                "the one from this package or skip it?");
-
-            BAlert *alert = new BAlert(T("file_exists"), alertString.String(),
-                T("Replace"), T("Skip"), T("Abort"));
-
             choice = alert->Go();
             switch (choice) {
                 case 0:
@@ -323 +351 @@
 
             if (policy == P_EXISTS_NONE) {
                 // TODO: Maybe add 'No, but ask again' type of choice as well?
-                alertString = T("Do you want to remember this decision for the rest of "
-                    "this installation?\nAll existing files will be ");
+                alertString = TR("Do you want to remember this decision for "
+                    "the rest of this installation?\n");
                 alertString << ((choice == P_EXISTS_OVERWRITE)
-                    ? T("replaced?") : T("skipped?"));
+                    ? TR("All existing files will be replaced?") 
+                    : TR("All existing files will be skipped?"));
 
-                alert = new BAlert(T("policy_decision"), alertString.String(),
-                    T("Yes"), T("No"));
+                alert = new BAlert("policy_decision", alertString.String(),
+                    TR("Replace"), TR("Skip"));
 
                 int32 decision = alert->Go();
                 if (decision == 0)
@@ -361 +390 @@
     fInstallTypes = new BPopUpMenu("none");
 
     BMenuField *installType = new BMenuField("install_type",
-        T("Installation type:"), fInstallTypes, 0);
+        TR("Installation type:"), fInstallTypes, 0);
     installType->SetAlignment(B_ALIGN_RIGHT);
     installType->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_MIDDLE));
 
@@ -370 +399 @@
     fInstallDesc->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     fInstallDesc->MakeEditable(false);
     fInstallDesc->MakeSelectable(false);
-    fInstallDesc->SetText(T("No installation type selected"));
+    fInstallDesc->SetText(TR("No installation type selected"));
     fInstallDesc->TextHeight(0, fInstallDesc->TextLength());
 
-    fInstall = new BButton("install_button", T("Install"),
+    fInstall = new BButton("install_button", TR("Install"),
             new BMessage(P_MSG_INSTALL));
 
     BView *installField = BGroupLayoutBuilder(B_VERTICAL, 5.0f)
@@ -436 +465 @@
     fInstallTypes = new BPopUpMenu("none");
 
     BMenuField *installType = new BMenuField(BRect(2, 2, 100, 50), "install_type",
-        T("Installation type:"), fInstallTypes, false);
+        TR("Installation type:"), fInstallTypes, false);
     installType->SetDivider(installType->StringWidth(installType->Label()) + 8);
     installType->SetAlignment(B_ALIGN_RIGHT);
     installType->ResizeToPreferred();
@@ -450 +479 @@
         B_WILL_DRAW);
     fInstallDesc->MakeEditable(false);
     fInstallDesc->MakeSelectable(false);
-    fInstallDesc->SetText(T("No installation type selected"));
+    fInstallDesc->SetText(TR("No installation type selected"));
     fInstallDesc->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
     fInstallDesc->ResizeTo(rect.Width() - B_V_SCROLL_BAR_WIDTH, 60);
@@ -469 +498 @@
     rect = installBox->Frame();
     rect.top = rect.bottom + 5;
     rect.bottom += 35;
-    fDestField = new BMenuField(rect, "install_to", T("Install to:"),
+    fDestField = new BMenuField(rect, "install_to", TR("Install to:"),
             fDestination, false);
     fDestField->SetDivider(fDestField->StringWidth(fDestField->Label()) + 8);
     fDestField->SetAlignment(B_ALIGN_RIGHT);
@@ -477 +506 @@
 
     AddChild(fDestField);
 
-    fInstall = new BButton(rect, "install_button", T("Install"),
+    fInstall = new BButton(rect, "install_button", TR("Install"),
             new BMessage(P_MSG_INSTALL));
     fInstall->ResizeToPreferred();
     AddChild(fInstall);
@@ -493 +522 @@
     int i = 0, num = fInfo.GetProfileCount();
     pkg_profile *prof;
     BMenuItem *item = 0;
-    char sizeString[32];
+    char sizeString[48];
     BString name = "";
     BMessage *message;
 
     if (num > 0) { // Add the default item
         prof = fInfo.GetProfile(0);
-        convert_size(prof->space_needed, sizeString, 32);
-        name << prof->name << " (" << sizeString << ")";
+        convert_size(prof->space_needed, sizeString, 48);
+        char kbuffer[512];
+        snprintf(kbuffer, sizeof(kbuffer), "(%s)", sizeString);
+        name << prof->name << kbuffer;
 
         message = new BMessage(P_MSG_GROUP_CHANGED);
         message->AddInt32("index", 0);
@@ -514 +545 @@
         prof = fInfo.GetProfile(i);
 
         if (prof) {
-            convert_size(prof->space_needed, sizeString, 32);
+            convert_size(prof->space_needed, sizeString, 48);
             name = prof->name;
-            name << " (" << sizeString << ")";
+            char kbuffer[512];
+            snprintf(kbuffer, sizeof(kbuffer), "(%s)", sizeString);
+            name << kbuffer;
 
             message = new BMessage(P_MSG_GROUP_CHANGED);
             message->AddInt32("index", i);
@@ -554 +587 @@
         BPath path;
         BMessage *temp;
         BVolume volume;
+        char kbuffer[512];
+        const char *tmp = TR("(%s free)");
 
         if (prof->path_type == P_INSTALL_PATH) {
             dev_t device;
             BString name;
-            char sizeString[32];
+            char sizeString[48];
 
             if (find_directory(B_BEOS_APPS_DIRECTORY, &path) == B_OK) {
                 device = dev_for_path(path.Path());
@@ -566 +601 @@
                     temp = new BMessage(P_MSG_PATH_CHANGED);
                     temp->AddString("path", BString(path.Path()));
 
-                    convert_size(volume.FreeBytes(), sizeString, 32);
+                    convert_size(volume.FreeBytes(), sizeString, 48);
                     name = path.Path();
-                    name << " (" << sizeString << " free)";
+                    snprintf(kbuffer, sizeof(kbuffer), tmp, sizeString);
+                    name << kbuffer;
                     item = new BMenuItem(name.String(), temp);
                     item->SetTarget(this);
                     fDestination->AddItem(item);
@@ -580 +616 @@
                     temp = new BMessage(P_MSG_PATH_CHANGED);
                     temp->AddString("path", BString(path.Path()));
 
-                    convert_size(volume.FreeBytes(), sizeString, 32);
+                    convert_size(volume.FreeBytes(), sizeString, 48);
+                    char kbuffer[512];
+                    snprintf(kbuffer, sizeof(kbuffer), tmp, sizeString);
                     name = path.Path();
-                    name << " (" << sizeString << " free)";
+                    name << kbuffer;
                     item = new BMenuItem(name.String(), temp);
                     item->SetTarget(this);
                     fDestination->AddItem(item);
@@ -595 +633 @@
             }
             fDestination->AddSeparatorItem();
 
-            item = new BMenuItem("Other" B_UTF8_ELLIPSIS, new BMessage(P_MSG_OPEN_PANEL));
+            item = new BMenuItem(TR("Other" B_UTF8_ELLIPSIS), 
+                new BMessage(P_MSG_OPEN_PANEL));
             item->SetTarget(this);
             fDestination->AddItem(item);
 
@@ -603 +642 @@
         } else if (prof->path_type == P_USER_PATH) {
             BString name;
             bool defaultPathSet = false;
-            char sizeString[32], volumeName[B_FILE_NAME_LENGTH];
+            char sizeString[48], volumeName[B_FILE_NAME_LENGTH];
             BVolumeRoster roster;
             BDirectory mountPoint;
 
@@ -619 +658 @@
                 temp = new BMessage(P_MSG_PATH_CHANGED);
                 temp->AddString("path", BString(path.Path()));
 
-                convert_size(volume.FreeBytes(), sizeString, 32);
+                convert_size(volume.FreeBytes(), sizeString, 48);
                 volume.GetName(volumeName);
                 name = volumeName;
-                name << " (" << sizeString << " free)";
+                snprintf(kbuffer, sizeof(kbuffer), tmp, sizeString);
+                name << kbuffer;
                 item = new BMenuItem(name.String(), temp);
                 item->SetTarget(this);
                 fDestination->AddItem(item);