Ticket #5889: tracker.patch

VolumeWindow.cpp

@@ -32 +32 @@
 All rights reserved.
 */
 
+#include <Catalog.h>
 #include <Debug.h>
+#include <Locale.h>
 #include <Menu.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
@@ -47 +49 @@
 #include "MountMenu.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BVolumeWindow::BVolumeWindow(LockingList<BWindow> *windowList, uint32 openFlags)
     :   BContainerWindow(windowList, openFlags)
 {
@@ -79 +85 @@
         }
     }
 
-    BMenuItem *item = fMenuBar->FindItem("Unmount");
+    BMenuItem* item = fMenuBar->FindItem(
+        B_TRANSLATE("Unmount"));
     if (item)
         item->SetEnabled(ejectableVolumeSelected);
 }
@@ -88 +95 @@
 void
 BVolumeWindow::AddFileMenu(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Find"B_UTF8_ELLIPSIS,
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Find"B_UTF8_ELLIPSIS),
         new BMessage(kFindButton), 'F'));
     menu->AddSeparatorItem();
 
-    menu->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
 
-    BMenuItem *item = new BMenuItem("Unmount", new BMessage(kUnmountVolume), 'U');
+    BMenuItem* item = new BMenuItem(
+        B_TRANSLATE("Unmount"),
+        new BMessage(kUnmountVolume), 'U');
     item->SetEnabled(false);
     menu->AddItem(item);
 
-    menu->AddItem(new BMenuItem("Mount settings" B_UTF8_ELLIPSIS,
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Mount settings" B_UTF8_ELLIPSIS),
         new BMessage(kRunAutomounterSettings)));
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenu(kAddOnsMenuName));
+    menu->AddItem(new BMenu(
+        B_TRANSLATE("Add-ons")));
     menu->SetTargetForItems(PoseView());
 }
 
@@ -118 +136 @@
         return;
     }
 
-    menu->AddItem(new BMenuItem("Icon view", new BMessage(kIconMode)));
-    menu->AddItem(new BMenuItem("Mini icon view", new BMessage(kMiniIconMode)));
-    menu->AddItem(new BMenuItem("List view", new BMessage(kListMode)));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Icon view"),
+        new BMessage(kIconMode)));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Mini icon view"),
+        new BMessage(kMiniIconMode)));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("List view"),
+        new BMessage(kListMode)));
     menu->AddSeparatorItem();
 
-    BMenuItem *resizeItem = new BMenuItem("Resize to fit",new BMessage(kResizeToFit), 'Y');
+    BMenuItem* resizeItem = new BMenuItem(
+        B_TRANSLATE("Resize to fit"),
+        new BMessage(kResizeToFit), 'Y');
     menu->AddItem(resizeItem);
-    menu->AddItem(new BMenuItem("Clean up", new BMessage(kCleanup), 'K'));
-    menu->AddItem(new BMenuItem("Select"B_UTF8_ELLIPSIS, new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
-    menu->AddItem(new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
-    menu->AddItem(new BMenuItem("Invert selection", new BMessage(kInvertSelection), 'S'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Clean up"),
+        new BMessage(kCleanup), 'K'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
+        new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Invert selection"),
+        new BMessage(kInvertSelection), 'S'));
 
-    BMenuItem *closeItem = new BMenuItem("Close",new BMessage(B_QUIT_REQUESTED), 'W');
+    BMenuItem* closeItem = new BMenuItem(
+        B_TRANSLATE("Close"),
+        new BMessage(B_QUIT_REQUESTED), 'W');
     menu->AddItem(closeItem);
     menu->AddSeparatorItem();
 
-    menu->AddItem(new MountMenu("Mount"));
+    menu->AddItem(new MountMenu(
+        B_TRANSLATE("Mount")));
     menu->AddSeparatorItem();
 
-    menu->AddItem(new BMenu(kAddOnsMenuName));
+    menu->AddItem(new BMenu(
+        B_TRANSLATE("Add-ons")));
 
     // target items as needed
     menu->SetTargetForItems(PoseView());

SettingsViews.cpp

@@ -43 +43 @@
 
 #include <Box.h>
 #include <Button.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <ColorControl.h>
 #include <NodeMonitor.h>
@@ -78 +80 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 SettingsView::SettingsView(BRect rect, const char *name)
     : BView(rect, name, B_FOLLOW_ALL, 0)
 {
@@ -164 +169 @@
     : SettingsView(rect, "DesktopSettingsView")
 {
     rect.OffsetTo(B_ORIGIN);
-    fShowDisksIconRadioButton = new BRadioButton(rect, "", "Show Disks icon",
+    fShowDisksIconRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("Show Disks icon"),
         new BMessage(kShowDisksIconChanged));
     fShowDisksIconRadioButton->ResizeToPreferred();
     AddChild(fShowDisksIconRadioButton);
@@ -173 +179 @@
     rect.OffsetBy(0, itemSpacing);
 
     fMountVolumesOntoDesktopRadioButton = new BRadioButton(rect, "",
-        "Show volumes on Desktop", new BMessage(kVolumesOnDesktopChanged));
+        B_TRANSLATE("Show volumes on Desktop"),
+        new BMessage(kVolumesOnDesktopChanged));
     AddChild(fMountVolumesOntoDesktopRadioButton);
     fMountVolumesOntoDesktopRadioButton->ResizeToPreferred();
 
     rect.OffsetBy(20, itemSpacing);
 
     fMountSharedVolumesOntoDesktopCheckBox = new BCheckBox(rect, "",
-        "Show shared volumes on Desktop", new BMessage(kVolumesOnDesktopChanged));
+        B_TRANSLATE("Show shared volumes on Desktop"),
+        new BMessage(kVolumesOnDesktopChanged));
     AddChild(fMountSharedVolumesOntoDesktopCheckBox);
     fMountSharedVolumesOntoDesktopCheckBox->ResizeToPreferred();
 
@@ -188 +196 @@
 
     rect = Bounds();
     rect.top = rect.bottom;
-    fMountButton = new BButton(rect, "", "Mount settings" B_UTF8_ELLIPSIS,
+    fMountButton = new BButton(rect, "",
+        B_TRANSLATE("Mount settings" B_UTF8_ELLIPSIS),
         new BMessage(kRunAutomounterSettings), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
     fMountButton->ResizeToPreferred();
     fMountButton->MoveBy(0, -fMountButton->Bounds().Height());
@@ -409 +418 @@
     : SettingsView(rect, "WindowsSettingsView")
 {
     rect.OffsetTo(B_ORIGIN);
-    fShowFullPathInTitleBarCheckBox = new BCheckBox(rect, "", "Show folder location in title tab",
+    fShowFullPathInTitleBarCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Show folder location in title tab"),
         new BMessage(kWindowsShowFullPathChanged));
     fShowFullPathInTitleBarCheckBox->ResizeToPreferred();
     AddChild(fShowFullPathInTitleBarCheckBox);
@@ -417 +427 @@
     const float itemSpacing = fShowFullPathInTitleBarCheckBox->Bounds().Height() + kItemExtraSpacing;
     rect.OffsetBy(0, itemSpacing);
 
-    fSingleWindowBrowseCheckBox = new BCheckBox(rect, "", "Single window navigation",
+    fSingleWindowBrowseCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Single window navigation"),
         new BMessage(kSingleWindowBrowseChanged));
     fSingleWindowBrowseCheckBox->ResizeToPreferred();
     AddChild(fSingleWindowBrowseCheckBox);
 
     rect.OffsetBy(20, itemSpacing);
 
-    fShowNavigatorCheckBox = new BCheckBox(rect, "", "Show navigator",
+    fShowNavigatorCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Show navigator"),
         new BMessage(kShowNavigatorChanged));
     fShowNavigatorCheckBox->ResizeToPreferred();
     AddChild(fShowNavigatorCheckBox);
 
     rect.OffsetBy(-20, itemSpacing);
 
-    fOutlineSelectionCheckBox = new BCheckBox(rect, "", "Outline selection rectangle only",
+    fOutlineSelectionCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Outline selection rectangle only"),
         new BMessage(kTransparentSelectionChanged));
     fOutlineSelectionCheckBox->ResizeToPreferred();
     AddChild(fOutlineSelectionCheckBox);
 
     rect.OffsetBy(0, itemSpacing);
 
-    fSortFolderNamesFirstCheckBox = new BCheckBox(rect, "", "List folders first",
+    fSortFolderNamesFirstCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("List folders first"),
         new BMessage(kSortFolderNamesFirstChanged));
     fSortFolderNamesFirstCheckBox->ResizeToPreferred();
     AddChild(fSortFolderNamesFirstCheckBox);
 
     rect.OffsetBy(0, itemSpacing);
 
-    fTypeAheadFilteringCheckBox = new BCheckBox(rect, "", "Enable type-ahead filtering",
+    fTypeAheadFilteringCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Enable type-ahead filtering"),
         new BMessage(kTypeAheadFilteringChanged));
     fTypeAheadFilteringCheckBox->ResizeToPreferred();
     AddChild(fTypeAheadFilteringCheckBox);
@@ -714 +729 @@
 
     rect.bottom = ceilf(fontHeight.ascent + fontHeight.descent) + 10;
     BBox *clockBox = new BBox(rect, "Clock");
-    clockBox->SetLabel("Clock");
+    clockBox->SetLabel(B_TRANSLATE("Clock"));
     AddChild(clockBox);
 
     rect.left = 8;
     rect.top = rect.bottom - 8;
-    f24HrRadioButton = new BRadioButton(rect, "", "24 hour",
+    f24HrRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("24 hour"),
         new BMessage(kSettingsContentsModified));
     f24HrRadioButton->ResizeToPreferred();
     clockBox->AddChild(f24HrRadioButton);
@@ -727 +743 @@
     const float itemSpacing = f24HrRadioButton->Bounds().Height() + kItemExtraSpacing;
     rect.OffsetBy(0, itemSpacing);
 
-    f12HrRadioButton = new BRadioButton(rect, "", "12 hour",
+    f12HrRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("12 hour"),
         new BMessage(kSettingsContentsModified));
     f12HrRadioButton->ResizeToPreferred();
     clockBox->AddChild(f12HrRadioButton);
@@ -739 +756 @@
     rect = clockBox->Frame();
     rect.OffsetBy(rect.Width() + 8, 0);
     BBox *dateFormatBox = new BBox(rect, "Date order");
-    dateFormatBox->SetLabel("Date order");
+    dateFormatBox->SetLabel(B_TRANSLATE("Date order"));
     AddChild(dateFormatBox);
 
     rect = f24HrRadioButton->Frame();
-    fYMDRadioButton = new BRadioButton(rect, "", "Year-month-day",
+    fYMDRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("Year-month-day"),
         new BMessage(kSettingsContentsModified));
     fYMDRadioButton->ResizeToPreferred();
     dateFormatBox->AddChild(fYMDRadioButton);
 
     rect.OffsetBy(0, itemSpacing);
 
-    fDMYRadioButton = new BRadioButton(rect, "", "Day-month-year",
+    fDMYRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("Day-month-year"),
         new BMessage(kSettingsContentsModified));
     fDMYRadioButton->ResizeToPreferred();
     dateFormatBox->AddChild(fDMYRadioButton);
 
     rect.OffsetBy(0, itemSpacing);
 
-    fMDYRadioButton = new BRadioButton(rect, "", "Month-day-year",
+    fMDYRadioButton = new BRadioButton(rect, "",
+        B_TRANSLATE("Month-day-year"),
         new BMessage(kSettingsContentsModified));
     fMDYRadioButton->ResizeToPreferred();
     dateFormatBox->AddChild(fMDYRadioButton);
@@ -766 +786 @@
         dateFormatBox->Bounds().Height());
 
     BPopUpMenu *menu = new BPopUpMenu("Separator");
-    menu->AddItem(new BMenuItem("None", new BMessage(kSettingsContentsModified)));
-    menu->AddItem(new BMenuItem("Space", new BMessage(kSettingsContentsModified)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("None"),
+        new BMessage(kSettingsContentsModified)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Space"),
+        new BMessage(kSettingsContentsModified)));
     menu->AddItem(new BMenuItem("-", new BMessage(kSettingsContentsModified)));
     menu->AddItem(new BMenuItem("/", new BMessage(kSettingsContentsModified)));
     menu->AddItem(new BMenuItem("\\", new BMessage(kSettingsContentsModified)));
@@ -785 +807 @@
 
     rect.OffsetBy(0, itemSpacing + 10);
 
-    BStringView *exampleView = new BStringView(rect, "", "Examples:");
+    BStringView* exampleView = new BStringView(rect, "", B_TRANSLATE("Examples:"));
     exampleView->ResizeToPreferred();
     AddChild(exampleView);
 
@@ -1052 +1074 @@
     : SettingsView(rect, "SpaceBarSettingsView")
 {
     rect.OffsetTo(B_ORIGIN);
-    fSpaceBarShowCheckBox = new BCheckBox(rect, "", "Show space bars on volumes",
+    fSpaceBarShowCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Show space bars on volumes"),
         new BMessage(kUpdateVolumeSpaceBar));
     fSpaceBarShowCheckBox->ResizeToPreferred();
     AddChild(fSpaceBarShowCheckBox);
@@ -1064 +1087 @@
     menu->SetFont(be_plain_font);
 
     BMenuItem *item;
-    menu->AddItem(item = new BMenuItem("Used space color", new BMessage(kSpaceBarSwitchColor)));
+    menu->AddItem(item = new BMenuItem(
+        B_TRANSLATE("Used space color"),
+        new BMessage(kSpaceBarSwitchColor)));
     item->SetMarked(true);
     fCurrentColor = 0;
-    menu->AddItem(new BMenuItem("Free space color", new BMessage(kSpaceBarSwitchColor)));
-    menu->AddItem(new BMenuItem("Warning space color", new BMessage(kSpaceBarSwitchColor)));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Free space color"),
+        new BMessage(kSpaceBarSwitchColor)));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Warning space color"),
+        new BMessage(kSpaceBarSwitchColor)));
 
     BBox *box = new BBox(rect);
     box->SetLabel(fColorPicker = new BMenuField(rect, NULL, NULL, menu));
@@ -1302 +1331 @@
     : SettingsView(rect, "TrashSettingsView")
 {
     rect.OffsetTo(B_ORIGIN);
-    fDontMoveFilesToTrashCheckBox = new BCheckBox(rect, "", "Don't move files to Trash",
+    fDontMoveFilesToTrashCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Don't move files to Trash"),
             new BMessage(kDontMoveFilesToTrashChanged));
     fDontMoveFilesToTrashCheckBox->ResizeToPreferred();
     AddChild(fDontMoveFilesToTrashCheckBox);
@@ -1310 +1340 @@
     rect = fDontMoveFilesToTrashCheckBox->Frame();
     rect.OffsetBy(0, fDontMoveFilesToTrashCheckBox->Bounds().Height() + kItemExtraSpacing);
 
-    fAskBeforeDeleteFileCheckBox = new BCheckBox(rect, "", "Ask before delete",
+    fAskBeforeDeleteFileCheckBox = new BCheckBox(rect, "",
+        B_TRANSLATE("Ask before delete"),
             new BMessage(kAskBeforeDeleteFileChanged));
     fAskBeforeDeleteFileCheckBox->ResizeToPreferred();
     AddChild(fAskBeforeDeleteFileCheckBox);

InfoWindow.cpp

@@ -40 +40 @@
 #include <stdlib.h>
 
 #include <Alert.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <File.h>
 #include <Font.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <Mime.h>
 #include <NodeInfo.h>
@@ -73 +75 @@
 #include "WidgetAttributeText.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
+
 namespace BPrivate {
 
 // States for tracking the mouse
@@ -214 +220 @@
 const uint32 kPaneSwitchOpen = 2;
 
 
-static BString &
-PrintFloat(BString &result, float number)
-{
-    char buffer[128];
-    sprintf(buffer, "%.1f", number);
-    result += buffer;
-    return result;
-}
-
-
 static void
 OpenParentAndSelectOriginal(const entry_ref *ref)
 {
@@ -389 +385 @@
     if (!TargetModel()->IsVolume() && !TargetModel()->IsRoot()) {
         if (TargetModel()->IsDirectory()) {
             // if this is a folder then spawn thread to calculate size
-            SetSizeStr("calculating" B_UTF8_ELLIPSIS);
+            SetSizeStr(
+                B_TRANSLATE("calculating" B_UTF8_ELLIPSIS));
             fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize",
                 B_NORMAL_PRIORITY, this);
             resume_thread(fCalcThreadID);
@@ -402 +399 @@
         }
     }
 
-    BString buffer;
-    buffer << TargetModel()->Name() << " info";
+    BString buffer(B_TRANSLATE_COMMENT("%name info", "InfoWindow Title"));
+    buffer.ReplaceFirst("%name", TargetModel()->Name());
     SetTitle(buffer.String());
 
     lock.Unlock();
@@ -461 +458 @@
 
             // Start recalculating..
             fStopCalc = false;
-            SetSizeStr("calculating" B_UTF8_ELLIPSIS);
+            SetSizeStr(
+                B_TRANSLATE("calculating" B_UTF8_ELLIPSIS));
             fCalcThreadID = spawn_thread(BInfoWindow::CalcSize, "CalcSize",
                 B_NORMAL_PRIORITY, this);
             resume_thread(fCalcThreadID);
@@ -652 +650 @@
 void
 BInfoWindow::GetSizeString(BString &result, off_t size, int32 fileCount)
 {
-    char numStr[256];
-    sprintf(numStr, "%Ld", size);
-    BString bytes;
+    char sizeString[256];
 
-    uint32 length = strlen(numStr);
-    if (length >= 4) {
-        uint32 charsTillComma = length % 3;
-        if (charsTillComma == 0)
-            charsTillComma = 3;
+    if (fileCount) {
+        if (size >= kGBSize) {
+            result.SetTo(B_TRANSLATE("%size GiB (%bytes bytes) for %num files"));
+            sprintf(sizeString, "%.1f", (float)size / kGBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else if (size >= kMBSize) {
+            result.SetTo(B_TRANSLATE("%size MiB (%bytes bytes) for %num files"));
+            sprintf(sizeString, "%.1f", (float)size / kMBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else if (size >= kKBSize) {
+            result.SetTo(B_TRANSLATE("%size KiB (%bytes bytes) for %num files"));
+            sprintf(sizeString, "%lld", (int64)(size + kHalfKBSize) / kKBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else {
+            result.SetTo(B_TRANSLATE("%bytes bytes for %num files"));
+        }
 
-        uint32 numberIndex = 0;
+        char numString[16];
+        sprintf(numString, "%ld", fileCount);
+        result.ReplaceFirst("%num", numString);
 
-        while (numStr[numberIndex]) {
-            bytes += numStr[numberIndex++];
-            if (--charsTillComma == 0 && numStr[numberIndex]) {
-                bytes += ',';
-                charsTillComma = 3;
-            }
+    } else {
+        if (size >= kGBSize) {
+            result.SetTo(B_TRANSLATE("%size GiB (%bytes bytes)"));
+            sprintf(sizeString, "%.1f", (float)size / kGBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else if (size >= kMBSize) {
+            result.SetTo(B_TRANSLATE("%size MiB (%bytes bytes)"));
+            sprintf(sizeString, "%.1f", (float)size / kMBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else if (size >= kKBSize) {
+            result.SetTo(B_TRANSLATE("%size KiB (%bytes bytes)"));
+            sprintf(sizeString, "%lld", (int64)(size + kHalfKBSize) / kKBSize);
+            result.ReplaceFirst("%size", sizeString);
+        } else {
+            result.SetTo(B_TRANSLATE("%bytes bytes"));
         }
-    } else
-        bytes = numStr;
+    }
 
-    if (size >= kGBSize)
-        PrintFloat(result, (float)size / kGBSize) << " GiB";
-    else if (size >= kMBSize)
-        PrintFloat(result, (float)size / kMBSize) << " MiB";
-    else if (size >= kKBSize)
-        result << (int64)(size + kHalfKBSize) / kKBSize << "KiB";
-    else
-        result << size;
-
-    if (size >= kKBSize)
-        result << " (" << bytes;
-
-    result << " bytes";
-
-    if (size >= kKBSize)
-        result  << ")";
-
-    if (fileCount)
-        result << " for " << fileCount << " files";
+    char bytesString[32];
+    sprintf(bytesString, ("%lld"), size);
+    result.ReplaceFirst("%bytes", bytesString);
 }
 
 
@@ -711 +712 @@
         if (!lock)
             return B_ERROR;
 
-        window->SetSizeStr("Error calculating folder size.");
+        window->SetSizeStr(
+            B_TRANSLATE("Error calculating folder size."));
         return B_ERROR;
     }
 
@@ -799 +801 @@
             false, &message);
 
         if (fFilePanel != NULL) {
-            fFilePanel->SetButtonLabel(B_DEFAULT_BUTTON,"Select");
+            fFilePanel->SetButtonLabel(B_DEFAULT_BUTTON,
+                B_TRANSLATE("Select"));
             fFilePanel->Window()->ResizeTo(500, 300);
-            BString title;
-            title << "Link \"" << fModel->Name() << "\" to:";
+            BString title(B_TRANSLATE_COMMENT("Link \"%name\" to:", "File dialog title for new sym link"));
+            title.ReplaceFirst("%name", fModel->Name());
             fFilePanel->Window()->SetTitle(title.String());
             fFilePanel->Show();
             fFilePanelOpen = true;
@@ -880 +883 @@
     // Find offset for attributes, might be overiden below if there
     // is a prefered handle menu displayed
     currentFont.SetSize(kAttribFontHeight);
-    fDivider = currentFont.StringWidth("Modified:") + kBorderMargin + kBorderWidth + 1;
+    fDivider = currentFont.StringWidth(
+        B_TRANSLATE("Modified:"))
+        + kBorderMargin + kBorderWidth + 1;
     // Add a preferred handler pop-up menu if this item
     // is a file...This goes in place of the Link To:
     // string...
@@ -897 +902 @@
                 fTitleRect.bottom + (lineHeight * 7),
                 Bounds().Width() - 5, fTitleRect.bottom + (lineHeight * 8));
             fPreferredAppMenu = new BMenuField(preferredAppRect, "", "", new BPopUpMenu(""));
-            fDivider = currentFont.StringWidth("Opens with:") + 5;
+            fDivider = currentFont.StringWidth(
+                B_TRANSLATE("Opens with:")) + 5;
             fPreferredAppMenu->SetDivider(fDivider);
             fDivider += (preferredAppRect.left - 2);
             fPreferredAppMenu->SetFont(&currentFont);
             fPreferredAppMenu->SetHighColor(kAttrTitleColor);
-            fPreferredAppMenu->SetLabel("Opens with:");
+            fPreferredAppMenu->SetLabel(
+                B_TRANSLATE("Opens with:"));
 
             char prefSignature[B_MIME_TYPE_LENGTH];
             nodeInfo.GetPreferredApp(prefSignature);
@@ -912 +919 @@
 
             // Add the default menu item and set it to marked
             BMenuItem *result;
-            result = new BMenuItem("Default application", new BMessage(kSetPreferredApp));
+            result = new BMenuItem(
+                B_TRANSLATE("Default application"),
+                new BMessage(kSetPreferredApp));
             result->SetTarget(this);
             fPreferredAppMenu->Menu()->AddItem(result);
             result->SetMarked(true);
@@ -952 +961 @@
 
     fPermissionsSwitch = new PaneSwitch(BRect(), "Permissions");
     fPermissionsSwitch->SetMessage(new BMessage(kPermissionsSelected));
-    fPermissionsSwitch->SetLabels(NULL, "Permissions");
+    fPermissionsSwitch->SetLabels(NULL,
+        B_TRANSLATE("Permissions"));
     AddChild(fPermissionsSwitch);
     fPermissionsSwitch->ResizeToPreferred();
     fPermissionsSwitch->MoveTo(kBorderWidth + 3,
@@ -1547 +1557 @@
             return;
 
         fFreeBytes = freeBytes;
-        char buffer[500];
-        if (capacity >= kGBSize)
-            sprintf(buffer, "%.1f G", (float)capacity / kGBSize);
-        else
-            sprintf(buffer, "%.1f M", (float)capacity / kMBSize);
 
-        sprintf(buffer + strlen(buffer), "B (%.1f MB used -- %.1f MB free)",
-            (float)(capacity - fFreeBytes) / kMBSize,
-            (float)fFreeBytes / kMBSize);
+        char capacityStr[16], usedStr[16], freeStr[16];
+        sprintf(usedStr, "%.1f", (float)(capacity - fFreeBytes) / kMBSize);
+        sprintf(freeStr, "%.1f", (float)fFreeBytes / kMBSize);
 
-        fSizeStr = buffer;
+        if (capacity >= kGBSize) {
+            fSizeStr.SetTo(B_TRANSLATE("%capacity GB (%used MB used -- %free MB free)"));
+            sprintf(capacityStr, "%.1f", (float)capacity / kGBSize);
+        } else {
+            fSizeStr.SetTo(B_TRANSLATE("%capacity MB (%used MB used -- %free MB free)"));
+            sprintf(capacityStr, "%.1f", (float)capacity / kMBSize);
+        }
+        fSizeStr.ReplaceFirst("%capacity", capacityStr);
+        fSizeStr.ReplaceFirst("%used", usedStr);
+        fSizeStr.ReplaceFirst("%free", freeStr);
+
     } else if (fModel->IsFile()) {
         // poll for size changes because they do not get node monitored
         // until a file gets closed (with the old BFS)
@@ -1687 +1702 @@
     // Capacity/size
     SetHighColor(kAttrTitleColor);
     if (fModel->IsVolume() || fModel->IsRoot()) {
-        MovePenTo(BPoint(fDivider - (StringWidth("Capacity:")), lineBase));
-        DrawString("Capacity:");
+        MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Capacity:"))),
+            lineBase));
+        DrawString(B_TRANSLATE("Capacity:"));
     } else {
-        MovePenTo(BPoint(fDivider - (StringWidth("Size:")), lineBase));
+        MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Size:"))),
+            lineBase));
         fSizeRect.left = fDivider + 2;
         fSizeRect.top = lineBase - fontMetrics.ascent;
         fSizeRect.bottom = lineBase + fontMetrics.descent;
-        DrawString("Size:");
+        DrawString(B_TRANSLATE("Size:"));
     }
 
     MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
@@ -1714 +1731 @@
 
     // Created
     SetHighColor(kAttrTitleColor);
-    MovePenTo(BPoint(fDivider - (StringWidth("Created:")), lineBase));
+    MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Created:"))),
+        lineBase));
     SetHighColor(kAttrTitleColor);
-    DrawString("Created:");
+    DrawString(B_TRANSLATE("Created:"));
     MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
     SetHighColor(kAttrValueColor);
     DrawString(fCreatedStr.String());
     lineBase += lineHeight;
 
     // Modified
-    MovePenTo(BPoint(fDivider - (StringWidth("Modified:")), lineBase));
+    MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Modified:"))),
+        lineBase));
     SetHighColor(kAttrTitleColor);
-    DrawString("Modified:");
+    DrawString(B_TRANSLATE("Modified:"));
     MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
     SetHighColor(kAttrValueColor);
     DrawString(fModifiedStr.String());
     lineBase += lineHeight;
 
     // Kind
-    MovePenTo(BPoint(fDivider - (StringWidth("Kind:")), lineBase));
+    MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Kind:"))), lineBase));
     SetHighColor(kAttrTitleColor);
-    DrawString("Kind:");
+    DrawString(B_TRANSLATE("Kind:"));
     MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
     SetHighColor(kAttrValueColor);
     DrawString(fKindStr.String());
@@ -1744 +1763 @@
     GetFont(&normalFont);
 
     // Path
-    MovePenTo(BPoint(fDivider - (StringWidth("Location:")), lineBase));
+    MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Location:"))),
+        lineBase));
     SetHighColor(kAttrTitleColor);
-    DrawString("Location:");
+    DrawString(B_TRANSLATE("Location:"));
 
     MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
     SetHighColor(kLinkColor);
@@ -1770 +1790 @@
 
     // Link to/version
     if (fModel->IsSymLink()) {
-        MovePenTo(BPoint(fDivider - (StringWidth("Link to:")), lineBase));
+        MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Link to:"))),
+            lineBase));
         SetHighColor(kAttrTitleColor);
-        DrawString("Link To:");
+        DrawString(B_TRANSLATE("Link To:"));
         MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
         SetHighColor(kLinkColor);
 
@@ -1795 +1816 @@
         fDescRect = BRect(-1, -1, -1, -1);
     } else if (fModel->IsExecutable()) {
         //Version
-        MovePenTo(BPoint(fDivider - (StringWidth("Version:")), lineBase));
+        MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Version:"))),
+            lineBase));
         SetHighColor(kAttrTitleColor);
-        DrawString("Version:");
+        DrawString(B_TRANSLATE("Version:"));
         MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
         SetHighColor(kAttrValueColor);
         BString nameString;
@@ -1808 +1830 @@
         lineBase += lineHeight;
 
         // Description
-        MovePenTo(BPoint(fDivider - (StringWidth("Description:")), lineBase));
+        MovePenTo(BPoint(fDivider - (StringWidth(B_TRANSLATE("Description:"))),
+            lineBase));
         SetHighColor(kAttrTitleColor);
-        DrawString("Description:");
+        DrawString(B_TRANSLATE("Description:"));
         MovePenTo(BPoint(fDivider + kDrawMargin, lineBase));
         SetHighColor(kAttrValueColor);
         // Check for truncation
@@ -1893 +1916 @@
         if (entry.InitCheck() == B_OK
             && entry.GetParent(&parent) == B_OK) {
             if (parent.Contains(text)) {
-                (new BAlert("", "That name is already taken. "
-                    "Please type another one.", "OK", 0, 0,
-                    B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                (new BAlert("",
+                    B_TRANSLATE("That name is already taken. "
+                    "Please type another one."),
+                    B_TRANSLATE("OK"),
+                    0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
                 reopen = true;
             } else {
                 if (fModel->IsVolume()) {
@@ -1914 +1939 @@
             }
         }
     } else if (length >= B_FILE_NAME_LENGTH) {
-        (new BAlert("", "That name is too long. "
-            "Please type another one.", "OK", 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        (new BAlert("",
+            B_TRANSLATE("That name is too long. "
+            "Please type another one."),
+            B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
         reopen = true;
     }
 
@@ -2020 +2047 @@
         navigationItem->SetTarget(be_app);
     }
 
-    parent->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
+    parent->AddItem(new BMenuItem(B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
 
     if (!model.IsTrash()) {
-        parent->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+        parent->AddItem(
+            new BMenuItem(B_TRANSLATE("Edit name"),
+            new BMessage(kEditItem), 'E'));
         parent->AddSeparatorItem();
         if (fModel->IsVolume()) {
-            BMenuItem *item;
-            parent->AddItem(item = new BMenuItem("Unmount", new BMessage(kUnmountVolume), 'U'));
+            BMenuItem* item;
+            parent->AddItem(
+                item = new BMenuItem(B_TRANSLATE("Unmount"),
+                new BMessage(kUnmountVolume), 'U'));
             // volume model, enable/disable the Unmount item
             BVolume boot;
             BVolumeRoster().GetBootVolume(&boot);
@@ -2036 +2068 @@
             if (volume == boot)
                 item->SetEnabled(false);
         } else
-            parent->AddItem(new BMenuItem("Identify", new BMessage(kIdentifyEntry)));
+            parent->AddItem(
+                new BMenuItem(B_TRANSLATE("Identify"),
+                new BMessage(kIdentifyEntry)));
     } else
-        parent->AddItem(new BMenuItem("Empty Trash", new BMessage(kEmptyTrash)));
+        parent->AddItem(
+            new BMenuItem(B_TRANSLATE("Empty Trash"),
+            new BMessage(kEmptyTrash)));
 
     BMenuItem *sizeItem = NULL;
     if (model.IsDirectory() && !model.IsVolume() && !model.IsRoot())  {
-        parent->AddItem(sizeItem = new BMenuItem("Recalculate folder size",
+        parent->AddItem(sizeItem = new BMenuItem(B_TRANSLATE("Recalculate folder size"),
             new BMessage(kRecalculateSize)));
     }
 
     if (model.IsSymLink()) {
-        parent->AddItem(sizeItem = new BMenuItem("Set new link target",
+        parent->AddItem(sizeItem = new BMenuItem(B_TRANSLATE("Set new link target"),
             new BMessage(kSetLinkTarget)));
     }
 
     parent->AddItem(new BSeparatorItem());
-    parent->AddItem(new BMenuItem("Permissions", new BMessage(kPermissionsSelected), 'P'));
+    parent->AddItem(new BMenuItem(B_TRANSLATE("Permissions"),
+        new BMessage(kPermissionsSelected), 'P'));
 
     parent->SetFont(be_plain_font);
     parent->SetTargetForItems(this);

TemplatesMenu.h

@@ -46 +46 @@
 class TemplatesMenu : public BMenu {
 public:
     TemplatesMenu(const BMessenger &target,
-        const char *label = kTemplatesMenuName);
+        const char *label);
     virtual ~TemplatesMenu();
 
 

FilePanelPriv.cpp

@@ -53 +53 @@
 #include <Alert.h>
 #include <Application.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <MenuBar.h>
 #include <MenuField.h>
 #include <MenuItem.h>
@@ -76 +78 @@
 #include <string.h>
 
 
+
 const char *kDefaultFilePanelTemplate = "FilePanelSettings";
 
-
 static uint32
 GetLinkFlavor(const Model *model, bool resolve = true)
 {
@@ -133 +135 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 TFilePanel::TFilePanel(file_panel_mode mode, BMessenger *target,
         const BEntry *startDir, uint32 nodeFlavors, bool multipleSelection,
         BMessage *message, BRefFilter *filter, uint32 containerWindowFlags,
@@ -441 +446 @@
     fPoseView->SetRefFilter(filter);
     fPoseView->CommitActivePose();
     fPoseView->Refresh();
-    FavoritesMenu *menu = dynamic_cast<FavoritesMenu *>(
-        fMenuBar->FindItem("Favorites")->Submenu());
+    FavoritesMenu* menu = dynamic_cast<FavoritesMenu *>(
+        fMenuBar->FindItem(
+            B_TRANSLATE("Favorites"))->Submenu());
     if (menu)
         menu->SetRefFilter(filter);
 }
@@ -498 +504 @@
 
     BTextControl *textControl = dynamic_cast<BTextControl *>(FindView("text view"));
     BObjectList<BPose> *selectionList = fPoseView->SelectionList();
-    const char *buttonText = fButtonText.String();
+    BString buttonText = fButtonText;
     bool enabled = false;
 
     if (fIsSavePanel && textControl) {
@@ -509 +515 @@
                 Model *model = selectionList->FirstItem()->TargetModel();
                 if (model->ResolveIfLink()->IsDirectory()) {
                     enabled = true;
-                    buttonText = "Open";
+                    buttonText = B_TRANSLATE("Open");
                 } else {
                     // insert the name of the selected model into the text field
                     textControl->SetText(model->Name());
@@ -546 +552 @@
         }
     }
 
-    button->SetLabel(buttonText);
+    button->SetLabel(buttonText.String());
     button->SetEnabled(enabled);
 }
 
@@ -597 +603 @@
     AddMenus();
     AddContextMenus();
 
-    FavoritesMenu *favorites = new FavoritesMenu("Favorites",
+    FavoritesMenu* favorites = new FavoritesMenu(
+        B_TRANSLATE("Favorites"),
         new BMessage(kSwitchDirectory), new BMessage(B_REFS_RECEIVED),
         BMessenger(this), IsSavePanel(), fPoseView->RefFilter());
-    favorites->AddItem(new BMenuItem("Add current folder",
+    favorites->AddItem(new BMenuItem(
+        B_TRANSLATE("Add current folder"),
         new BMessage(kAddCurrentDir)));
-    favorites->AddItem(new BMenuItem("Edit favorites"B_UTF8_ELLIPSIS,
+    favorites->AddItem(new BMenuItem(
+        B_TRANSLATE("Edit favorites"B_UTF8_ELLIPSIS),
         new BMessage(kEditFavorites)));
 
     fMenuBar->AddItem(favorites);
 
     // configure menus
-    BMenuItem *item = fMenuBar->FindItem("Window");
+    BMenuItem* item = fMenuBar->FindItem(
+        B_TRANSLATE("Window"));
     if (item) {
         fMenuBar->RemoveItem(item);
         delete item;
     }
 
-    item = fMenuBar->FindItem("File");
+    item = fMenuBar->FindItem(B_TRANSLATE("File"));
     if (item) {
         BMenu *menu = item->Submenu();
         if (menu) {
@@ -627 +637 @@
                 delete item;
 
             // remove add-ons menu, identifier menu, separator
-            item = menu->FindItem(kAddOnsMenuName);
+            item = menu->FindItem(B_TRANSLATE("Add-ons"));
             if (item) {
                 int32 index = menu->IndexOf(item);
                 delete menu->RemoveItem(index);
@@ -683 +693 @@
         rect.right = rect.left + 170;
         rect.bottom = rect.top + 13;
 
-        fTextControl = new BTextControl(rect, "text view",  "save text", "", NULL,
-            B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
+        fTextControl = new BTextControl(rect, "text view",
+            B_TRANSLATE("save text"),
+            "", NULL, B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
         DisallowMetaKeys(fTextControl->TextView());
         DisallowFilenameKeys(fTextControl->TextView());
         fBackView->AddChild(fTextControl);
         fTextControl->SetDivider(0.0f);
         fTextControl->TextView()->SetMaxBytes(B_FILE_NAME_LENGTH - 1);
 
-        fButtonText = "Save";
+        fButtonText.SetTo(B_TRANSLATE("Save"));
     } else
-        fButtonText = "Open";
+        fButtonText.SetTo(B_TRANSLATE("Open"));
 
     rect = windRect;
     rect.OffsetTo(10, fDirMenuField->Frame().bottom + 10);
@@ -741 +752 @@
     fBackView->AddChild(default_button);
 
     rect.right = rect.left -= 10;
-    float cancel_width = be_plain_font->StringWidth("Cancel") + 20;
+    float cancel_width = be_plain_font->StringWidth(
+        B_TRANSLATE("Cancel")) + 20;
     rect.left = (cancel_width > 75) ? (rect.right - cancel_width) : (rect.right - 75);
 
-    BButton *cancel_button = new BButton(rect, "cancel button", "Cancel",
+    BButton* cancel_button = new BButton(rect, "cancel button",
+        B_TRANSLATE("Cancel"),
         new BMessage(kCancelButton), B_FOLLOW_RIGHT + B_FOLLOW_BOTTOM);
     fBackView->AddChild(cancel_button);
 
@@ -847 +860 @@
 void
 TFilePanel::AddFileContextMenus(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
-    menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash() ?
-            "Delete" : "Move to Trash",
-            new BMessage(kMoveToTrash), 'T'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+        ? B_TRANSLATE("Delete")
+        : B_TRANSLATE("Move to Trash"),
+        new BMessage(kMoveToTrash), 'T'));
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Cut", new BMessage(B_CUT), 'X'));
-    menu->AddItem(new BMenuItem("Copy", new BMessage(B_COPY), 'C'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Cut"),
+        new BMessage(B_CUT), 'X'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Copy"),
+        new BMessage(B_COPY), 'C'));
 //  menu->AddItem(pasteItem = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
 
     menu->SetTargetForItems(PoseView());
@@ -864 +882 @@
 void
 TFilePanel::AddVolumeContextMenus(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Cut", new BMessage(B_CUT), 'X'));
-    menu->AddItem(new BMenuItem("Copy", new BMessage(B_COPY), 'C'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Cut"),
+        new BMessage(B_CUT), 'X'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Copy"),
+        new BMessage(B_COPY), 'C'));
 //  menu->AddItem(pasteItem = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
 
     menu->SetTargetForItems(PoseView());
@@ -879 +902 @@
 void
 TFilePanel::AddWindowContextMenus(BMenu *menu)
 {
-    BMenuItem *item = new BMenuItem("New folder", new BMessage(kNewFolder), 'N');
+    BMenuItem* item = new BMenuItem(
+        B_TRANSLATE("New folder"),
+        new BMessage(kNewFolder), 'N');
     item->SetTarget(PoseView());
     menu->AddItem(item);
     menu->AddSeparatorItem();
 
-    item = new BMenuItem("Paste", new BMessage(B_PASTE), 'V');
+    item = new BMenuItem(
+        B_TRANSLATE("Paste"),
+        new BMessage(B_PASTE), 'V');
     item->SetTarget(PoseView());
     menu->AddItem(item);
     menu->AddSeparatorItem();
 
-    item = new BMenuItem("Select"B_UTF8_ELLIPSIS, new BMessage(kShowSelectionWindow),
-        'A', B_SHIFT_KEY);
+    item = new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
+        new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A');
+    item = new BMenuItem(
+        B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Invert selection", new BMessage(kInvertSelection), 'S');
+    item = new BMenuItem(
+        B_TRANSLATE("Invert selection"),
+        new BMessage(kInvertSelection), 'S');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Go to parent", new BMessage(kOpenParentDir), B_UP_ARROW);
+    item = new BMenuItem(
+        B_TRANSLATE("Go to parent"),
+        new BMessage(kOpenParentDir), B_UP_ARROW);
     item->SetTarget(this);
     menu->AddItem(item);
 }
@@ -1051 +1085 @@
 
                             // Don't allow saves of multiple files
                             if (count > 1) {
-                                ShowCenteredAlert("Sorry, saving more than one item is not allowed.",
-                                    "Cancel");
+                                ShowCenteredAlert(
+                                    B_TRANSLATE("Sorry, saving more than one item is not allowed."),
+                                    B_TRANSLATE("Cancel"));
                             } else {
                                 // if we are a savepanel, set up the filepanel correctly
                                 // then pass control so we follow the same path as if the user
@@ -1341 +1376 @@
     BDirectory dir;
 
     if (TargetModel()->IsRoot()) {
-        ShowCenteredAlert("Sorry, you can't save things at the root of "
-            "your system.", "Cancel");
+        ShowCenteredAlert(
+            B_TRANSLATE("Sorry, you can't save things at the root of "
+            "your system."),
+            B_TRANSLATE("Cancel"));
         return;
     }
 
     // check for some illegal file names
     if (strcmp(fTextControl->Text(), ".") == 0
         || strcmp(fTextControl->Text(), "..") == 0) {
-        ShowCenteredAlert("The specified name is illegal. Please choose "
-            "another name.", "Cancel");
+        ShowCenteredAlert(
+            B_TRANSLATE("The specified name is illegal. Please choose "
+            "another name."),
+            B_TRANSLATE("Cancel"));
         fTextControl->TextView()->SelectAll();
         return;
     }
 
     if (dir.SetTo(TargetModel()->EntryRef()) != B_OK) {
-        ShowCenteredAlert("There was a problem trying to save in the folder "
-            "you specified. Please try another one.", "Cancel");
+        ShowCenteredAlert(
+            B_TRANSLATE("There was a problem trying to save in the folder "
+            "you specified. Please try another one."),
+            B_TRANSLATE("Cancel"));
         return;
     }
 
     if (dir.Contains(fTextControl->Text())) {
         if (dir.Contains(fTextControl->Text(), B_DIRECTORY_NODE)) {
-            ShowCenteredAlert("The specified name is already used as the name "
-                "of a folder. Please choose another name.", "Cancel");
+            ShowCenteredAlert(
+                B_TRANSLATE("The specified name is already used as the name "
+                "of a folder. Please choose another name."),
+                B_TRANSLATE("Cancel"));
             fTextControl->TextView()->SelectAll();
             return;
         } else {
             // if this was invoked by a dbl click, it is an explicit replacement
             // of the file.
-            BString str;
-            str << "The file \"" << fTextControl->Text() << "\" already exists in the "
-                "specified folder. Do you want to replace it?";
+            BString str(B_TRANSLATE("The file \"%name\" already exists in the specified folder. Do you want to replace it?"));
+            str.ReplaceFirst("%name", fTextControl->Text());
 
-            if (ShowCenteredAlert(str.String(), "Cancel", "Replace") == 0) {
+            if (ShowCenteredAlert(str.String(),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Replace"))
+                == 0) {
                 // user canceled
                 fTextControl->TextView()->SelectAll();
                 return;

TrackerSettingsWindow.cpp

@@ -32 +32 @@
 All rights reserved.
 */
 
+#include <Catalog.h>
+#include <Locale.h>
 
 #include "SettingsViews.h"
 #include "TrackerSettings.h"
@@ -63 +65 @@
 const uint32 kRevertButtonPressed = 'Rebp';
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 TrackerSettingsWindow::TrackerSettingsWindow()
-    : BWindow(BRect(80, 80, 450, 350), "Tracker preferences", B_TITLED_WINDOW,
+    : BWindow(BRect(80, 80, 450, 350),
+        B_TRANSLATE("Tracker preferences"),
+        B_TITLED_WINDOW,
         B_NOT_MINIMIZABLE | B_NOT_RESIZABLE | B_NO_WORKSPACE_ACTIVATION
         | B_NOT_ANCHORED_ON_ACTIVATE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
 {
@@ -74 +81 @@
     AddChild(topView);
 
     rect.InsetBy(10, 10);
-    rect.right = rect.left + be_plain_font->StringWidth("Volume Icons")
+    rect.right = rect.left + be_plain_font->StringWidth(
+        B_TRANSLATE("Volume Icons"))
         + (float)B_V_SCROLL_BAR_WIDTH + 40.0f;
     fSettingsTypeListView = new BListView(rect, "List View", B_SINGLE_SELECTION_LIST,
         B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM);
@@ -85 +93 @@
     rect = scrollView->Frame();
     rect.left = rect.right + 10;
     rect.top = rect.bottom;
-    fDefaultsButton = new BButton(rect, "Defaults", "Defaults",
+    fDefaultsButton = new BButton(rect, "Defaults",
+        B_TRANSLATE("Defaults"),
         new BMessage(kDefaultsButtonPressed), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
     fDefaultsButton->ResizeToPreferred();
     fDefaultsButton->SetEnabled(false);
@@ -93 +102 @@
 
     rect = fDefaultsButton->Frame();
     rect.left = rect.right + 10;
-    fRevertButton = new BButton(rect, "Revert", "Revert",
+    fRevertButton = new BButton(rect, "Revert",
+        B_TRANSLATE("Revert"),
         new BMessage(kRevertButtonPressed), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
     fRevertButton->SetEnabled(false);
     fRevertButton->ResizeToPreferred();
@@ -109 +119 @@
 
     rect = _SettingsFrame();
 
-    fSettingsTypeListView->AddItem(new SettingsItem("Desktop",
+    fSettingsTypeListView->AddItem(new SettingsItem(
+        B_TRANSLATE("Desktop"),
         new DesktopSettingsView(rect)));
-    fSettingsTypeListView->AddItem(new SettingsItem("Windows",
+    fSettingsTypeListView->AddItem(new SettingsItem(
+        B_TRANSLATE("Windows"),
         new WindowsSettingsView(rect)));
-    fSettingsTypeListView->AddItem(new SettingsItem("Date & Time",
+    fSettingsTypeListView->AddItem(new SettingsItem(
+        B_TRANSLATE("Date & Time"),
         new TimeFormatSettingsView(rect)));
-    fSettingsTypeListView->AddItem(new SettingsItem("Trash",
+    fSettingsTypeListView->AddItem(new SettingsItem(
+        B_TRANSLATE("Trash"),
         new TrashSettingsView(rect)));
-    fSettingsTypeListView->AddItem(new SettingsItem("Volume icons",
+    fSettingsTypeListView->AddItem(new SettingsItem(
+        B_TRANSLATE("Volume icons"),
         new SpaceBarSettingsView(rect)));
 
     // compute preferred view size

NavMenu.cpp

@@ -42 +42 @@
 
 #include <StopWatch.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Directory.h>
+#include <Locale.h>
 #include <Query.h>
 #include <Path.h>
 #include <Screen.h>
@@ -79 +81 @@
 {
     if (!dragmessage || !incoming)
         return false;
-        
     bool retvalue=false;
     for (int32 inIndex=0; incoming->HasRef("refs", inIndex); inIndex++) {
         entry_ref inRef;
@@ -137 +138 @@
         ModelMenuItem *item = dynamic_cast<ModelMenuItem *>(menu->ItemAt(index));
         if (!item)
             continue;
-            
         const Model *model = item->TargetModel();
         if (!model)
             continue;
@@ -183 +183 @@
         return;
         
     nodeinfo.SetTo(&node);
-    
     char mimestr[B_MIME_TYPE_LENGTH];       
     //  add it to the list
     if (nodeinfo.GetType(mimestr) == B_OK && strlen(mimestr) > 0) {
@@ -207 +206 @@
                 break;
             }
         }
-        
         if (unique) 
             typeslist->AddItem(new BString(mimestr));
     }
@@ -244 +242 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BNavMenu::BNavMenu(const char *title, uint32 message, const BHandler *target,
     BWindow *parentWindow, const BObjectList<BString> *list)
     :   BSlowMenu(title),
@@ -574 +575 @@
                     
             PoseInfo poseInfo;
             ssize_t size = -1;
-            
             if (result->Node()) 
                 size = result->Node()->ReadAttr(kAttrPoseInfo, B_RAW_TYPE, 0,
                     &poseInfo, sizeof(poseInfo));
@@ -722 +722 @@
     fItemList->MakeEmpty();
 
     if (!count) {
-        BMenuItem *item = new BMenuItem("Empty folder", 0);
+        BMenuItem *item = new BMenuItem(
+            B_TRANSLATE("Empty folder"),
+            0);
         item->SetEnabled(false);
         AddItem(item);
     }

TemplatesMenu.cpp

@@ -33 +33 @@
 */
 
 #include <Application.h>
+#include <Catalog.h>
 #include <FindDirectory.h>
 #include <Directory.h>
 #include <NodeInfo.h>
+#include <Locale.h>
 #include <Mime.h>
 #include <Message.h>
 #include <Path.h>
@@ -50 +52 @@
 #include "IconMenuItem.h"
 #include "MimeTypes.h"
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
+
 namespace BPrivate {
 
 const char *kTemplatesDirectory = "Tracker/Tracker New Templates";
-const char *kTemplatesMenuName = "New";
 
-static const char *kOpenTemplatesMenuName = "Edit templates"B_UTF8_ELLIPSIS;
 
 }
 
@@ -112 +117 @@
         delete RemoveItem(0L);
 
     // Add the Folder
-    IconMenuItem *menuItem = new IconMenuItem("New folder", new BMessage(kNewFolder),
-        B_DIR_MIMETYPE,B_MINI_ICON);
+    IconMenuItem *menuItem = new IconMenuItem(
+        B_TRANSLATE("New folder"),
+        new BMessage(kNewFolder),
+        B_DIR_MIMETYPE, B_MINI_ICON);
     AddItem(menuItem);
     menuItem->SetShortcut('N', 0);
 
@@ -172 +179 @@
     message->AddRef("refs", &dirRef);
     
     // Add item to show templates folder.
-    fOpenItem = new BMenuItem(kOpenTemplatesMenuName, message);
+    fOpenItem =
+        new BMenuItem(
+            B_TRANSLATE("Edit templates"B_UTF8_ELLIPSIS),
+            message);
     AddItem(fOpenItem);
     if (dirRef == entry_ref())
         fOpenItem->SetEnabled(false);

OpenWithWindow.cpp

@@ -44 +44 @@
 
 #include <Alert.h>
 #include <Button.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <Mime.h>
 #include <NodeInfo.h>
 #include <Path.h>
@@ -55 +57 @@
 #include <stdio.h>
 #include <string.h>
 
+
 const char *kDefaultOpenWithTemplate = "OpenWithSettings";
-
 // ToDo:
 // filter out trash
 // allow column configuring
@@ -70 +72 @@
 const rgb_color kOpenWithDefaultColor = { 0xFF, 0xFF, 0xCC, 255};
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 OpenWithContainerWindow::OpenWithContainerWindow(BMessage *entriesToOpen,
         LockingList<BWindow> *windowList, window_look look, window_feel feel,
         uint32 flags, uint32 workspace)
@@ -92 +97 @@
 
     // add buttons
 
-    fLaunchButton = new BButton(rect, "ok", "Open",
-        new BMessage(kDefaultButton), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+    fLaunchButton = new BButton(rect, "ok",
+        B_TRANSLATE("Open"),
+        new BMessage(kDefaultButton),
+        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
     fLaunchButton->ResizeToPreferred();
     fLaunchButton->MoveTo(rect.right - 10 - kDocumentKnobWidth
         - fLaunchButton->Bounds().Width(),
@@ -102 +109 @@
 
     BRect buttonRect = fLaunchButton->Frame();
     fLaunchAndMakeDefaultButton = new BButton(buttonRect, "make default",
-        "Open and make preferred", new BMessage(kOpenAndMakeDefault),
+        B_TRANSLATE("Open and make preferred"),
+        new BMessage(kOpenAndMakeDefault),
         B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
     // wide button, have to resize to fit text
     fLaunchAndMakeDefaultButton->ResizeToPreferred();
@@ -112 +120 @@
     fLaunchAndMakeDefaultButton->SetEnabled(false);
 
     buttonRect = fLaunchAndMakeDefaultButton->Frame();
-    BButton *button = new BButton(buttonRect, "cancel", "Cancel",
-        new BMessage(kCancelButton), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+    BButton *button = new BButton(buttonRect, "cancel",
+        B_TRANSLATE("Cancel"),
+        new BMessage(kCancelButton),
+        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
     button->ResizeToPreferred();
     button->MoveBy(- 10 - button->Bounds().Width(), 0);
     backgroundView->AddChild(button);
@@ -147 +157 @@
         SetTitle(buffer.String());
     } else
         // use generic title
-        SetTitle("Open selection with:");
+        SetTitle(B_TRANSLATE("Open selection with:"));
 
     AddCommonFilter(new BMessageFilter(B_KEY_DOWN, &OpenWithContainerWindow::KeyDownFilter));
 }
@@ -377 +387 @@
     message->AddInt32("attr_align", B_ALIGN_LEFT);
     message->AddBool("attr_editable", false);
     message->AddBool("attr_statfield", false);
-    BMenuItem *item = new BMenuItem("Relation", message);
+    BMenuItem *item = new BMenuItem(
+        B_TRANSLATE("Relation"),
+        message);
     menu->AddItem(item);
     message = new BMessage(kAttributeItem);
     message->AddString("attr_name", kAttrAppVersion);
@@ -387 +399 @@
     message->AddInt32("attr_align", B_ALIGN_LEFT);
     message->AddBool("attr_editable", false);
     message->AddBool("attr_statfield", false);
-    item = new BMenuItem("Version", message);
+    item = new BMenuItem(
+        B_TRANSLATE("Version"),
+        message);
     menu->AddItem(item);
 }
 
@@ -662 +676 @@
         errorString << "Could not find application \""
             << pose->TargetModel()->Name() << "\"";
 
-        (new BAlert("", errorString.String(), "OK", 0, 0, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go();
+        (new BAlert("", errorString.String(),
+            B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
         return;
     }
 
@@ -677 +692 @@
                 "publisher of the application and ask them to update their application "
                 "to list the type of your document as supported.";
 
-            BAlert *alert = new BAlert("", warning.String(),
-                "Cancel", "Open", 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("", warning.String(),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Open"),
+                0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             if (alert->Go() == 0)
                 return;
@@ -756 +773 @@
     if (fColumnList->CountItems() != 0)
         return;
 
-    BColumn *nameColumn = new BColumn("Name", kColumnStart, 125, B_ALIGN_LEFT,
+    BColumn *nameColumn = new BColumn(
+        B_TRANSLATE("Name"),
+        kColumnStart, 125, B_ALIGN_LEFT,
         kAttrStatName, B_STRING_TYPE, true, true);
     fColumnList->AddItem(nameColumn);
-    BColumn *relationColumn = new BColumn("Relation", 180, 100, B_ALIGN_LEFT,
+    BColumn *relationColumn = new BColumn(
+        B_TRANSLATE("Relation"),
+        180, 100, B_ALIGN_LEFT,
         kAttrOpenWithRelation, B_STRING_TYPE, false, false);
     fColumnList->AddItem(relationColumn);
-    fColumnList->AddItem(new BColumn("Location", 290, 225, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(
+        B_TRANSLATE("Location"),
+        290, 225, B_ALIGN_LEFT,
         kAttrPath, B_STRING_TYPE, true, false));
-    fColumnList->AddItem(new BColumn("Version", 525, 70, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(
+        B_TRANSLATE("Version"),
+        525, 70, B_ALIGN_LEFT,
         kAttrAppVersion, B_STRING_TYPE, false, false));
 
     // sort by relation and by name
@@ -1152 +1177 @@
         SetTargetForItems(fMessenger);
 
     if (!CountItems()) {
-        BMenuItem *item = new BMenuItem("no supporting apps", 0);
+        BMenuItem* item = new BMenuItem(
+            B_TRANSLATE("no supporting apps"),
+            0);
         item->SetEnabled(false);
         AddItem(item);
     }

FSUtils.cpp

@@ -51 +51 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <NodeInfo.h>
 #include <Path.h>
 #include <Roster.h>
@@ -99 +101 @@
 
 namespace BPrivate {
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 static status_t FSDeleteFolder(BEntry *, CopyLoopControl *, bool updateStatus,
     bool deleteTopDir = true, bool upateFileNameInStatus = false);
 static status_t MoveEntryToTrash(BEntry *, BPoint *, Undo &undo);
@@ -137 +142 @@
 #endif
 
 
-const char *kDeleteConfirmationStr = "Are you sure you want to delete the "
-    "selected item(s)? This operation cannot be reverted.";
+static const char* kDeleteConfirmationStr =
+    B_TRANSLATE_MARK("Are you sure you want to delete the "
+    "selected item(s)? This operation cannot be reverted.");
 
-const char *kReplaceStr = "You are trying to replace the item:\n"
-    "\t%s%s\n"
+static const char* kReplaceStr =
+    B_TRANSLATE_MARK("You are trying to replace the item:\n"
+    "\t%name%dest\n"
     "with:\n"
-    "\t%s%s\n\n"
-    "Would you like to replace it with the one you are %s?";
+    "\t%name%src\n\n"
+    "Would you like to replace it with the one you are %movemode?");
 
-const char *kDirectoryReplaceStr = "An item named \"%s\" already exists in "
+static const char* kDirectoryReplaceStr =
+    B_TRANSLATE_MARK("An item named \"%name\" already exists in "
     "this folder, and may contain\nitems with the same names. Would you like "
-    "to replace them with those contained in the folder you are %s?";
+    "to replace them with those contained in the folder you are %verb?");
 
-const char *kSymLinkReplaceStr = "An item named \"%s\" already exists in this "
+static const char* kSymLinkReplaceStr =
+    B_TRANSLATE_MARK("An item named \"%name\" already exists in this "
     "folder. Would you like to replace it with the symbolic link you are "
-    "creating?";
+    "creating?");
 
-const char *kNoFreeSpace = "Sorry, there is not enough free space on the "
-    "destination volume to copy the selection.";
+static const char* kNoFreeSpace =
+    B_TRANSLATE_MARK("Sorry, there is not enough free space on the "
+    "destination volume to copy the selection.");
 
-const char *kFileErrorString = "Error copying file \"%s\":\n\t%s\n\nWould "
-    "you like to continue?";
-const char *kFolderErrorString = "Error copying folder \"%s\":\n\t%s\n\nWould "
-    "you like to continue?";
-const char *kFileDeleteErrorString = "There was an error deleting \"%s\""
-    ":\n\t%s";
-const char *kReplaceManyStr = "Some items already exist in this folder with "
-    "the same names as the items you are %s.\n \nWould you like to replace "
-    "them with the ones you are %s or be prompted for each one?";
+static const char* kFileErrorString =
+    B_TRANSLATE_MARK("Error copying file \"%name\":\n\t%error\n\nWould "
+    "you like to continue?");
 
-const char *kFindAlternativeStr = "Would you like to find some other suitable "
-    "application?";
-const char *kFindApplicationStr = "Would you like to find a suitable "
-    "application to open the file?";
+static const char* kFolderErrorString =
+    B_TRANSLATE_MARK("Error copying folder \"%name\":\n\t%error\n\nWould you like to continue?");
 
+static const char* kFileDeleteErrorString =
+    B_TRANSLATE_MARK("There was an error deleting \"%name\""
+    ":\n\t%error");
+
+static const char* kReplaceManyStr =
+    B_TRANSLATE_MARK("Some items already exist in this folder with "
+    "the same names as the items you are %verb.\n \nWould you like to replace "
+    "them with the ones you are %verb or be prompted for each one?");
+
+static const char* kFindAlternativeStr =
+    B_TRANSLATE_MARK("Would you like to find some other suitable application?");
+
+static const char *kFindApplicationStr = B_TRANSLATE_MARK("Would you like to find a suitable "
+    "application to open the file?");
+
 // Skip these attributes when copying in Tracker
 const char *kSkipAttributes[] = {
     kAttrPoseInfo,
@@ -326 +343 @@
 TrackerCopyLoopControl::FileError(const char *message, const char *name,
     status_t error, bool allowContinue)
 {
-    char buffer[512];
-    sprintf(buffer, message, name, strerror(error));
+    BString buffer(message);
+    buffer.ReplaceFirst("%name", name);
+    buffer.ReplaceFirst("%error", strerror(error));
 
     if (allowContinue) {
-        BAlert *alert = new BAlert("", buffer, "Cancel", "OK", 0,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        BAlert* alert = new BAlert("", buffer.String(),
+            B_TRANSLATE("Cancel"),
+            B_TRANSLATE("OK"),
+            0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         return alert->Go() != 0;
     }
 
-    BAlert *alert = new BAlert("", buffer, "Cancel", 0, 0,
-        B_WIDTH_AS_USUAL, B_STOP_ALERT);
+    BAlert* alert = new BAlert("", buffer.String(),
+        B_TRANSLATE("Cancel"),
+        0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
     alert->SetShortcut(0, B_ESCAPE);
     alert->Go();
     return false;
@@ -608 +629 @@
         // quick way out
         return true;
 
-    const char *warning = NULL;
+    BString warning;
     bool requireOverride = true;
 
     if (DirectoryMatchesOrContains(entry, B_BEOS_DIRECTORY)) {
-        warning = "If you %s the system folder or its contents, you "
+        warning.SetTo(
+            B_TRANSLATE("If you %action the system folder or its contents, you "
             "won't be able to boot " OS_NAME "! Are you sure you want to do "
-            "this? To %s the system folder or its contents anyway, hold down "
-            "the Shift key and click \"Do it\".";
+            "this? To %action the system folder or its contents anyway, hold down "
+            "the Shift key and click \"Do it\"."));
     } else if (DirectoryMatches(entry, B_USER_DIRECTORY)) {
-        warning = "If you %s the home folder, " OS_NAME " may not "
+        warning .SetTo(
+            B_TRANSLATE("If you %action the home folder, " OS_NAME " may not "
             "behave properly! Are you sure you want to do this? "
-            "To %s the home anyway, click \"Do it\".";
+            "To %action the home anyway, click \"Do it\"."));
         requireOverride = false;
     } else if (DirectoryMatchesOrContains(entry, B_USER_CONFIG_DIRECTORY)
         || DirectoryMatchesOrContains(entry, B_COMMON_SETTINGS_DIRECTORY)) {
@@ -628 +651 @@
                 B_USER_SETTINGS_DIRECTORY)
             || DirectoryMatchesOrContains(entry, "beos_mime",
                 B_COMMON_SETTINGS_DIRECTORY)) {
-            warning = "If you %s the mime settings, " OS_NAME " may not "
+            warning.SetTo(
+                B_TRANSLATE("If you %action the mime settings, " OS_NAME " may not "
                 "behave properly! Are you sure you want to do this? "
-                "To %s the mime settings anyway, click \"Do it\".";
+                "To %action the mime settings anyway, click \"Do it\"."));
             requireOverride = false;
         } else if (DirectoryMatches(entry, B_USER_CONFIG_DIRECTORY)) {
-            warning = "If you %s the config folder, " OS_NAME " may not "
+            warning.SetTo(
+                B_TRANSLATE("If you %action the config folder, " OS_NAME " may not "
                 "behave properly! Are you sure you want to do this? "
-                "To %s the config folder anyway, click \"Do it\".";
+                "To %action the config folder anyway, click \"Do it\"."));
             requireOverride = false;
         } else if (DirectoryMatches(entry, B_USER_SETTINGS_DIRECTORY)
             || DirectoryMatches(entry, B_COMMON_SETTINGS_DIRECTORY)) {
-            warning = "If you %s the settings folder, " OS_NAME " may not "
+            warning.SetTo(
+                B_TRANSLATE("If you %action the settings folder, " OS_NAME " may not "
                 "behave properly! Are you sure you want to do this? "
-                "To %s the settings folder anyway, click \"Do it\".";
+                "To %action the settings folder anyway, click \"Do it\"."));
             requireOverride = false;
         }
     }
 
-    if (!warning)
+    if (!warning.Length())
         return true;
 
     if (dontAsk)
@@ -657 +683 @@
         // we already warned about moving home this time around
         return true;
 
-    char buffer[256];
-    sprintf(buffer, warning, action, action);
+    warning.ReplaceAll("%action", action);
 
-    if ((new OverrideAlert("", buffer, "Do it", (requireOverride
-            ? B_SHIFT_KEY : 0),
-            "Cancel", 0, NULL, 0, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go() == 1) {
-        if (confirmedAlready)
-            *confirmedAlready = kNotConfirmed;
-        return false;
+    if ((new OverrideAlert("", warning.String(),
+        B_TRANSLATE("Do it"),
+        (requireOverride ? B_SHIFT_KEY : 0),
+        B_TRANSLATE("Cancel"),
+        0, NULL, 0, B_WIDTH_AS_USUAL,
+        B_WARNING_ALERT))->Go() == 1) {
+            if (confirmedAlready)
+                *confirmedAlready = kNotConfirmed;
+            return false;
     }
 
     if (confirmedAlready) {
@@ -687 +714 @@
     int32 *collisionCount, ConflictCheckResult *preflightResult)
 {
     if (dstVol->IsReadOnly()) {
-        BAlert *alert = new BAlert("",
-            "You can't move or copy items to read-only volumes.",
-            "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("You can't move or copy items to read-only volumes."),
+            B_TRANSLATE("Cancel"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return B_ERROR;
@@ -702 +730 @@
         // the copy loops, except it takes forever to call CalcItemsAndSize
         BEntry entry((entry_ref *)srcList->ItemAt(index));
         if (IsDisksWindowIcon(&entry)) {
-            const char *errorStr;
+            BString errorStr;
             if (moveMode == kCreateLink)
-                errorStr = "You cannot create a link to the root directory.";
+                errorStr.SetTo(
+                    B_TRANSLATE("You cannot create a link to the root directory."));
             else
-                errorStr = "You cannot copy or move the root directory.";
+                errorStr.SetTo(
+                    B_TRANSLATE("You cannot copy or move the root directory."));
 
-            BAlert *alert = new BAlert("", errorStr, "Cancel", 0, 0,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("",
+                errorStr.String(),
+                B_TRANSLATE("Cancel"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
             return B_ERROR;
         }
         if (moveMode == kMoveSelectionTo
-            && !ConfirmChangeIfWellKnownDirectory(&entry, "move", false,
-                &askOnceOnly)) {
+            && !ConfirmChangeIfWellKnownDirectory(&entry,
+                B_TRANSLATE("move"),
+                false, &askOnceOnly)) {
             return B_ERROR;
         }
     }
@@ -753 +786 @@
 
                     // check for free space before starting copy
                     if ((totalSize + (4 * kKBSize)) >= dstVol->FreeBytes()) {
-                        BAlert *alert = new BAlert("", kNoFreeSpace, "Cancel",
+                        BAlert* alert = new BAlert("",
+                            B_TRANSLATE(kNoFreeSpace),
+                            B_TRANSLATE("Cancel"),
                             0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                         alert->SetShortcut(0, B_ESCAPE);
                         alert->Go();
@@ -923 +958 @@
 
             BEntry sourceEntry(srcRef);
             if (sourceEntry.InitCheck() != B_OK) {
-                BString error;
-                error << "Error moving \"" << srcRef->name << "\".";
-                BAlert *alert = new BAlert("", error.String(), "Cancel", 0, 0,
-                    B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                BString error(B_TRANSLATE("Error moving \"%name\"."));
+                    error.ReplaceFirst("%name", srcRef->name);
+                BAlert* alert = new BAlert("", error.String(),
+                    B_TRANSLATE("Cancel"),
+                    0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                 alert->SetShortcut(0, B_ESCAPE);
                 alert->Go();
                 break;
@@ -939 +975 @@
 
                 result = MoveEntryToTrash(&sourceEntry, loc, undo);
                 if (result != B_OK) {
-                    BString error;
-                    error << "Error moving \"" << srcRef->name
-                        << "\" to Trash. (" << strerror(result) << ")";
-                    BAlert *alert = new BAlert("", error.String(), "Cancel",
+                    BString error(B_TRANSLATE("Error moving \"%name\" to Trash. (%error)"));
+                    error.ReplaceFirst("%name", srcRef->name);
+                    error.ReplaceFirst("%error", strerror(result));
+                    BAlert* alert = new BAlert("", error.String(),
+                        B_TRANSLATE("Cancel"),
                         0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                     alert->SetShortcut(0, B_ESCAPE);
                     alert->Go();
@@ -1054 +1091 @@
 
     // check for free space first
     if ((srcStat->st_size + kKBSize) >= volume.FreeBytes()) {
-        loopControl->FileError(kNoFreeSpace, "", B_DEVICE_FULL, false);
+        loopControl->FileError(B_TRANSLATE(kNoFreeSpace),
+            "", B_DEVICE_FULL, false);
         throw (status_t)B_DEVICE_FULL;
     }
 
@@ -1066 +1104 @@
     loopControl->UpdateStatus(destName, ref, 1024, true);
 
     if (makeOriginalName) {
-        FSMakeOriginalName(destName, destDir, " copy");
+        BString suffix(" ");
+        suffix << B_TRANSLATE_COMMENT("copy", "filename copy"),
+        FSMakeOriginalName(destName, destDir, suffix.String());
         undo.UpdateEntry(srcFile, destName);
     }
 
@@ -1098 +1138 @@
             throw (status_t)err;
 
         if (err != B_OK) {
-            if (!loopControl->FileError(kFileErrorString, destName, err,
-                    true)) {
+            if (!loopControl->FileError(
+                B_TRANSLATE(kFileErrorString),
+                destName, err, true)) {
                 throw (status_t)err;
             } else {
                 // user selected continue in spite of error, update status bar
@@ -1371 +1412 @@
     loopControl->UpdateStatus(ref.name, ref, 1024, true);
 
     if (makeOriginalName) {
-        FSMakeOriginalName(destName, destDir, " copy");
+        BString suffix(" ");
+        suffix << B_TRANSLATE_COMMENT("copy", "filename copy"),
+        FSMakeOriginalName(destName, destDir, suffix.String());
         undo.UpdateEntry(srcEntry, destName);
     }
 
@@ -1417 +1460 @@
                 err = destDir->CreateDirectory(destName, &newDir);
         }
 #endif
-        if (err != B_OK) {
-            if (!loopControl->FileError(kFolderErrorString, destName, err,
-                    true)) {
+        if (err != B_OK) {
+            if (!loopControl->FileError(
+                B_TRANSLATE(kFolderErrorString),
+                destName, err, true)) {
                 throw err;
             }
 
@@ -1536 +1580 @@
             strcpy(name, ref.name);
 
             BSymLink link;
-            FSMakeOriginalName(name, destDir, " link");
+            BString suffix(" ");
+            suffix << B_TRANSLATE_COMMENT("link", "filename link"),
+            FSMakeOriginalName(name, destDir, suffix.String());
             undo.UpdateEntry(entry, name);
 
             BPath path;
@@ -1616 +1662 @@
                 err = destDir->CreateSymLink(name, path.Path(), &link);
 
             if (err == B_UNSUPPORTED) {
-                throw FailWithAlert(err, "The target disk does not support "
-                    "creating links.", NULL);
+                throw FailWithAlert(err,
+                    B_TRANSLATE("The target disk does not support "
+                    "creating links."), NULL);
             }
 
-            FailWithAlert::FailOnError(err, "Error creating link to \"%s\".",
+            FailWithAlert::FailOnError(err,
+                B_TRANSLATE("Error creating link to \"%name\"."),
                 ref.name);
 
             if (loc && loc != (BPoint *)-1) {
@@ -1659 +1707 @@
         // no alert, was already taken care of before
         return error;
     } catch (MoveError error) {
-        BString errorString;
-        errorString << "Error moving \"" << ref.name << '"';
-        (new BAlert("", errorString.String(), "OK", 0, 0, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go();
+        BString errorString(B_TRANSLATE("Error moving \"%name\""));
+        errorString.ReplaceFirst("%name", ref.name);
+        (new BAlert("", errorString.String(),
+            B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
         return error.fError;
     } catch (FailWithAlert error) {
-        char buffer[256];
+        BString buffer(error.fString);
         if (error.fName)
-            sprintf(buffer, error.fString, error.fName);
+            buffer.ReplaceFirst("%name", error.fName);
         else
-            strcpy(buffer, error.fString);
-        (new BAlert("", buffer, "OK", 0, 0, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go();
+            buffer <<  error.fString;
+        (new BAlert("", buffer.String(),
+            B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
 
         return error.fError;
     }
@@ -1803 +1853 @@
             if (volume == boot) {
                 char name[B_FILE_NAME_LENGTH];
                 volume.GetName(name);
-                char buffer[256];
-                sprintf(buffer, "Cannot unmount the boot volume \"%s\".",
-                    name);
-                BAlert *alert = new BAlert("", buffer, "Cancel", 0, 0,
-                    B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                BString buffer(B_TRANSLATE("Cannot unmount the boot volume \"%name\"."));
+                buffer.ReplaceFirst("%name", name);
+                BAlert *alert = new BAlert("", buffer.String(),
+                    B_TRANSLATE("Cancel"),
+                    0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                 alert->SetShortcut(0, B_ESCAPE);
                 alert->Go();
             } else {
@@ -1828 +1878 @@
         trash_dir.GetEntry(&trashEntry);
 
         if (dir == trash_dir || dir.Contains(&trashEntry)) {
-            (new BAlert("", "You cannot put the Trash, home or Desktop "
-                "directory into the trash.", "OK", 0, 0,
-                    B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            (new BAlert("",
+                B_TRANSLATE("You cannot put the Trash, home or Desktop "
+                "directory into the trash."),
+                B_TRANSLATE("OK"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
 
             // return no error so we don't get two dialogs
             return B_OK;
@@ -1854 +1906 @@
     char name[B_FILE_NAME_LENGTH];
     strcpy(name, ref.name);
     if (trash_dir.Contains(name)) {
-        FSMakeOriginalName(name, &trash_dir, " copy");
+        BString suffix(" ");
+        suffix << B_TRANSLATE_COMMENT("copy", "filename copy"),
+        FSMakeOriginalName(name, &trash_dir, suffix.String());
         undo.UpdateEntry(entry, name);
     }
 
@@ -1911 +1965 @@
     // prompt user only if there is more than one collision, otherwise the
     // single collision case will be handled as a "Prompt" case by CheckName
     if (*collisionCount > 1) {
-        const char *verb = (moveMode == kMoveSelectionTo) ? "moving"
-            : "copying";
-        char replaceMsg[256];
-        sprintf(replaceMsg, kReplaceManyStr, verb, verb);
+        const char *verb = (moveMode == kMoveSelectionTo)
+            ? B_TRANSLATE("moving")
+            : B_TRANSLATE("copying");
+        BString replaceMsg(B_TRANSLATE(kReplaceManyStr));
+        replaceMsg.ReplaceAll("%verb", verb);
 
-        BAlert *alert = new BAlert("", replaceMsg,
-            "Cancel", "Prompt", "Replace all");
+        BAlert* alert = new BAlert("", replaceMsg.String(),
+            B_TRANSLATE("Cancel"),
+            B_TRANSLATE("Prompt"),
+            B_TRANSLATE("Replace all"));
         alert->SetShortcut(0, B_ESCAPE);
         switch (alert->Go()) {
             case 0:
@@ -1974 +2031 @@
             && moveMode != kCreateRelativeLink
             && (srcDirectory == *destDir
                 || srcDirectory.Contains(&destEntry))) {
-            (new BAlert("", "You can't move a folder into itself "
-                "or any of its own sub-folders.", "OK", 0, 0,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            (new BAlert("",
+                B_TRANSLATE("You can't move a folder into itself "
+                "or any of its own sub-folders."),
+                B_TRANSLATE("OK"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
             return B_ERROR;
         }
     }
 
     if (FSIsTrashDir(sourceEntry) && moveMode != kCreateLink
         && moveMode != kCreateRelativeLink) {
-        (new BAlert("", "You can't move or copy the trash.",
-            "OK", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        (new BAlert("",
+            B_TRANSLATE("You can't move or copy the trash."),
+            B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
         return B_ERROR;
     }
 
@@ -2007 +2068 @@
     if (destIsDir) {
         BDirectory test_dir(&entry);
         if (test_dir.Contains(sourceEntry)) {
-            (new BAlert("", "You can't replace a folder "
-                "with one of its sub-folders.", "OK", 0, 0,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            (new BAlert("",
+                B_TRANSLATE("You can't replace a folder "
+                "with one of its sub-folders."),
+                B_TRANSLATE("OK"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
             return B_ERROR;
         }
     }
@@ -2019 +2082 @@
         && moveMode != kCreateRelativeLink
         && destIsDir != sourceIsDirectory) {
             (new BAlert("", sourceIsDirectory
-                ? "You cannot replace a file with a folder or a symbolic "
-                    "link."
-                : "You cannot replace a folder or a symbolic link with a "
-                    "file.", "OK", 0, 0, B_WIDTH_AS_USUAL,
-                    B_WARNING_ALERT))->Go();
+                ? B_TRANSLATE("You cannot replace a file with a folder or a symbolic "
+                "link.")
+                : B_TRANSLATE("You cannot replace a folder or a symbolic link with a "
+                "file."),
+                B_TRANSLATE("OK"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
             return B_ERROR;
         }
 
     if (replaceAll != kReplaceAll) {
         // prompt user to determine whether to replace or not
 
-        char replaceMsg[512];
+        BString replaceMsg;
 
-        if (moveMode == kCreateLink || moveMode == kCreateRelativeLink)
-            sprintf(replaceMsg, kSymLinkReplaceStr, name);
-        else if (sourceEntry->IsDirectory())
-            sprintf(replaceMsg, kDirectoryReplaceStr, name,
-                moveMode == kMoveSelectionTo ? "moving" : "copying");
-        else {
+        if (moveMode == kCreateLink || moveMode == kCreateRelativeLink) {
+            replaceMsg.SetTo(B_TRANSLATE(kSymLinkReplaceStr));
+            replaceMsg.ReplaceFirst("%name", name);
+        } else if (sourceEntry->IsDirectory()) {
+            replaceMsg.SetTo(B_TRANSLATE(kDirectoryReplaceStr));
+            replaceMsg.ReplaceFirst("%name", name);
+            replaceMsg.ReplaceFirst("%verb",
+                moveMode == kMoveSelectionTo
+                ? B_TRANSLATE("moving")
+                : B_TRANSLATE("copying"));
+        } else {
             char sourceBuffer[96], destBuffer[96];
             StatStruct statBuffer;
 
@@ -2052 +2121 @@
             else
                 destBuffer[0] = '\0';
 
-            sprintf(replaceMsg, kReplaceStr, name, destBuffer, name,
-                sourceBuffer, moveMode == kMoveSelectionTo ? "moving"
-                    : "copying");
+            replaceMsg.SetTo(B_TRANSLATE(kReplaceStr));
+            replaceMsg.ReplaceAll("%name", name);
+            replaceMsg.ReplaceFirst("%dest", destBuffer);
+            replaceMsg.ReplaceFirst("%src", sourceBuffer);
+            replaceMsg.ReplaceFirst("%movemode",
+                moveMode == kMoveSelectionTo
+                ? B_TRANSLATE("moving")
+                : B_TRANSLATE("copying"));
         }
 
         // special case single collision (don't need Replace All shortcut)
         BAlert *alert;
         if (multipleCollisions || sourceIsDirectory)
-            alert = new BAlert("", replaceMsg, "Skip", "Replace all");
+            alert = new BAlert("", replaceMsg.String(),
+                B_TRANSLATE("Skip"),
+                B_TRANSLATE("Replace all"));
         else {
-            alert = new BAlert("", replaceMsg, "Cancel", "Replace");
+            alert = new BAlert("", replaceMsg.String(),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Replace"));
             alert->SetShortcut(0, B_ESCAPE);
         }
         switch (alert->Go()) {
@@ -2086 +2164 @@
         return B_OK;
 
     if (err != B_OK) {
-        BString error;
-        error << "There was a problem trying to replace \""
-            << name << "\". The item might be open or busy.";
-        BAlert *alert = new BAlert("", error.String(), "Cancel", 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BString error(B_TRANSLATE("There was a problem trying to replace \"%name\". The item might be open or busy."));
+        error.ReplaceFirst("%name", name);;
+        BAlert* alert = new BAlert("", error.String(),
+            B_TRANSLATE("Cancel"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
     }
@@ -2136 +2214 @@
         else if (err == B_OK)
             dir.Rewind();
         else {
-            loopControl->FileError(kFileDeleteErrorString, ref.name, err,
+            loopControl->FileError(
+                B_TRANSLATE(kFileDeleteErrorString),
+                ref.name, err,
                 false);
         }
     }
@@ -2705 +2785 @@
     }
 
     if (err != B_OK && err != kTrashCanceled && err != kUserCanceled) {
-        (new BAlert("", "Error emptying Trash!", "OK", NULL, NULL,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        (new BAlert("",
+            B_TRANSLATE("Error emptying Trash!"),
+            B_TRANSLATE("OK"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
     }
 
     return B_OK;
@@ -2720 +2802 @@
         bool dontMoveToTrash = TrackerSettings().DontMoveFilesToTrash();
 
         if (!dontMoveToTrash) {
-            BAlert *alert = new BAlert("", kDeleteConfirmationStr,
-                "Cancel", "Move to Trash", "Delete", B_WIDTH_AS_USUAL,
-                B_OFFSET_SPACING, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("",
+                B_TRANSLATE(kDeleteConfirmationStr),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Move to Trash"),
+                B_TRANSLATE("Delete"),
+                B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
 
             alert->SetShortcut(0, B_ESCAPE);
             alert->SetShortcut(1, 'm');
@@ -2737 +2822 @@
                     return B_OK;
             }
         } else {
-            BAlert *alert = new BAlert("", kDeleteConfirmationStr,
-                "Cancel", "Delete", NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
-                B_WARNING_ALERT);
+            BAlert* alert = new BAlert("",
+                B_TRANSLATE(kDeleteConfirmationStr),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Delete"),
+                NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
 
             alert->SetShortcut(0, B_ESCAPE);
             alert->SetShortcut(1, 'd');
@@ -2774 +2861 @@
         }
 
         if (err != kTrashCanceled && err != kUserCanceled && err != B_OK)
-            (new BAlert("", "Error deleting items", "OK", NULL, NULL,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            (new BAlert("",
+                B_TRANSLATE("Error deleting items"),
+                B_TRANSLATE("OK"),
+                NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
     }
 
     delete list;
@@ -2930 +3019 @@
     status_t result = dir.InitCheck();
     if (result == B_OK) {
         char name[B_FILE_NAME_LENGTH];
-        strcpy(name, "New folder");
+        strcpy(name, B_TRANSLATE("New folder"));
 
         int32 fnum = 1;
         while (dir.Contains(name)) {
@@ -2938 +3027 @@
             // ToDo:
             // move this logic ot FSMakeOriginalName
             if (++fnum > 9)
-                sprintf(name, "New folder%ld", fnum);
+                snprintf(name, sizeof(name),
+                    B_TRANSLATE("New folder%ld"),
+                    fnum);
             else
-                sprintf(name, "New folder %ld", fnum);
+                snprintf(name, sizeof(name),
+                    B_TRANSLATE("New folder %ld"),
+                    fnum);
         }
 
         BDirectory newDir;
@@ -2960 +3053 @@
         }
     }
 
-    BAlert *alert = new BAlert("", "Sorry, could not create a new folder.",
-        "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    BAlert* alert = new BAlert("",
+        B_TRANSLATE("Sorry, could not create a new folder."),
+        B_TRANSLATE("Cancel"),
+        0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
     alert->SetShortcut(0, B_ESCAPE);
     alert->Go();
     return result;
@@ -3120 +3215 @@
         if (nodeToClose)
             dynamic_cast<TTracker *>(be_app)->CloseParent(*nodeToClose);
     } else {
-        alertString << "Could not open \"" << appRef->name << "\" ("
-            << strerror(error) << "). ";
+        alertString.SetTo(B_TRANSLATE("Could not open \"%name\" (%error). "));
+        alertString.ReplaceFirst("%name", appRef->name);
+        alertString.ReplaceFirst("%error", strerror(error));
         if (refs && openWithOK && error != B_SHUTTING_DOWN) {
-            alertString << kFindAlternativeStr;
-            BAlert *alert = new BAlert("", alertString.String(),
-                "Cancel", "Find", 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alertString << B_TRANSLATE(kFindAlternativeStr);
+            BAlert* alert = new BAlert("", alertString.String(),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Find"),
+                0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             if (alert->Go() == 1)
                 error = TrackerOpenWith(refs);
         } else {
-            BAlert *alert = new BAlert("", alertString.String(),
-                "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("", alertString.String(),
+                B_TRANSLATE("Cancel"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
         }
@@ -3274 +3373 @@
         }
 
         if (error != B_OK) {
-            alertString << "Could not find an application to open \""
-                << documentRef.name << "\" (" << strerror(error) << "). ";
+            alertString.SetTo(B_TRANSLATE("Could not find an application to open \"%name\" (%error). "));
+            alertString.ReplaceFirst("%name", documentRef.name);
+            alertString.ReplaceFirst("%error", strerror(error));
             if (openWithOK)
-                alternative = kFindApplicationStr;
+                alternative = B_TRANSLATE(kFindApplicationStr);
 
             break;
         } else {
@@ -3325 +3425 @@
         }
 
         if (error == B_LAUNCH_FAILED_EXECUTABLE && !refsToPass) {
-            alertString << "Could not open \"" << app.name
-                << "\". The file is mistakenly marked as executable. ";
+            alertString.SetTo(B_TRANSLATE("Could not open \"%name\". The file is mistakenly marked as executable. "));
+            alertString.ReplaceFirst("%name", app.name);
 
             if (!openWithOK) {
                 // offer the possibility to change the permissions
 
-                alertString << "\nShould this be fixed?";
-                BAlert *alert = new BAlert("", alertString.String(),
-                    "Cancel", "Proceed", 0, B_WIDTH_AS_USUAL,
-                    B_WARNING_ALERT);
+                alertString << B_TRANSLATE("\nShould this be fixed?");
+                BAlert* alert = new BAlert("", alertString.String(),
+                    B_TRANSLATE("Cancel"),
+                    B_TRANSLATE("Proceed"),
+                    0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                 alert->SetShortcut(0, B_ESCAPE);
                 if (alert->Go() == 1) {
                     BEntry entry(&documentRef);
@@ -3350 +3451 @@
                         _TrackerLaunchDocuments(NULL, refs, false);
                         return;
                     } else {
-                        alertString = "Could not update permissions of "
-                            "file \"";
-                        alertString << app.name << "\". " << strerror(error);
+                        alertString.SetTo(B_TRANSLATE("Could not update permissions of file \"%name\". %error"));
+                        alertString.ReplaceFirst("%name", app.name);
+                        alertString.ReplaceFirst("%error", strerror(error));
                     }
                 } else
                     return;
             }
 
-            alternative = kFindApplicationStr;
+            alternative = B_TRANSLATE(kFindApplicationStr);
         } else if (error == B_LAUNCH_FAILED_APP_IN_TRASH) {
-            alertString << "Could not open \"" << documentRef.name
-                << "\" because application \"" << app.name << "\" is in the "
-                    "Trash. ";
-            alternative = kFindAlternativeStr;
+            alertString.SetTo(B_TRANSLATE("Could not open \"%document\" because application \"%app\" is in the Trash. "));
+            alertString.ReplaceFirst("%document", documentRef.name);
+            alertString.ReplaceFirst("%app", app.name);
+            alternative = B_TRANSLATE(kFindAlternativeStr);
         } else if (error == B_LAUNCH_FAILED_APP_NOT_FOUND) {
-            alertString << "Could not open \"" << documentRef.name << "\" "
-                << "(" << strerror(error) << "). ";
-            alternative = kFindAlternativeStr;
+            alertString.SetTo(B_TRANSLATE("Could not open \"%name\" (%error). "));
+            alertString.ReplaceFirst("%name", documentRef.name);
+            alertString.ReplaceFirst("%error", strerror(error));
+            alternative = B_TRANSLATE(kFindAlternativeStr);
         } else if (error == B_MISSING_SYMBOL
             && LoaderErrorDetails(&app, loaderErrorString) == B_OK) {
-            alertString << "Could not open \"" << documentRef.name << "\" ";
-            if (openedDocuments)
-                alertString << "with application \"" << app.name << "\" ";
-            alertString << "(Missing symbol: " << loaderErrorString << "). \n";
-            alternative = kFindAlternativeStr;
+            if (openedDocuments) {
+                alertString.SetTo(B_TRANSLATE("Could not open \"%document\" with application \"%app\" (Missing symbol: %symbol). \n"));
+                alertString.ReplaceFirst("%document", documentRef.name);
+                alertString.ReplaceFirst("%app", app.name);
+                alertString.ReplaceFirst("%symbol", loaderErrorString.String());
+            } else {
+                alertString.SetTo(B_TRANSLATE("Could not open \"%document\" (Missing symbol: %symbol). \n"));
+                alertString.ReplaceFirst("%document", documentRef.name);
+                alertString.ReplaceFirst("%symbol", loaderErrorString.String());
+            }
+            alternative = B_TRANSLATE(kFindAlternativeStr);
         } else if (error == B_MISSING_LIBRARY
             && LoaderErrorDetails(&app, loaderErrorString) == B_OK) {
-            alertString << "Could not open \"" << documentRef.name << "\" ";
-            if (openedDocuments)
-                alertString << "with application \"" << app.name << "\" ";
-            alertString << "(Missing libraries: " << loaderErrorString
-                << "). \n";
-            alternative = kFindAlternativeStr;
+            if (openedDocuments) {
+                alertString.SetTo(B_TRANSLATE("Could not open \"%document\" with application \"%app\" (Missing libraries: %library). \n"));
+                alertString.ReplaceFirst("%document", documentRef.name);
+                alertString.ReplaceFirst("%app", app.name);
+                alertString.ReplaceFirst("%library", loaderErrorString.String());
+            } else {
+                alertString.SetTo(B_TRANSLATE("Could not open \"%document\" (Missing libraries: %library). \n"));
+                alertString.ReplaceFirst("%document", documentRef.name);
+                alertString.ReplaceFirst("%library", loaderErrorString.String());
+            }
+            alternative = B_TRANSLATE(kFindAlternativeStr);
         } else {
-            alertString << "Could not open \"" << documentRef.name
-                << "\" with application \"" << app.name << "\" ("
-                << strerror(error) << "). ";
-            alternative = kFindAlternativeStr;
+            alertString.SetTo(B_TRANSLATE("Could not open \"%document\" with application \"%app\" (%error). "));
+                alertString.ReplaceFirst("%document", documentRef.name);
+                alertString.ReplaceFirst("%app", app.name);
+                alertString.ReplaceFirst("%error", strerror(error));
+            alternative = B_TRANSLATE(kFindAlternativeStr);
         }
     }
 
@@ -3395 +3509 @@
         if (openWithOK) {
             ASSERT(alternative);
             alertString << alternative;
-            BAlert *alert = new BAlert("", alertString.String(),
-                "Cancel", "Find", 0, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT);
+            BAlert* alert = new BAlert("", alertString.String(),
+                B_TRANSLATE("Cancel"),
+                B_TRANSLATE("Find"),
+                0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             if (alert->Go() == 1)
                 error = TrackerOpenWith(refs);
         } else {
-            BAlert *alert = new BAlert("", alertString.String(),
-                "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("", alertString.String(),
+                B_TRANSLATE("Cancel"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
         }

StatusWindow.cpp

@@ -39 +39 @@
 
 #include <Application.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <ControlLook.h>
 #include <Debug.h>
+#include <Locale.h>
 #include <MessageFilter.h>
 #include <StringView.h>
 #include <String.h>
@@ -182 +184 @@
 // #pragma mark - BStatusWindow
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
+
 BStatusWindow::BStatusWindow()
     :
-    BWindow(kStatusRect, "Tracker status", B_TITLED_WINDOW,
+    BWindow(kStatusRect,
+        B_TRANSLATE("Tracker status"),
+        B_TITLED_WINDOW,
         B_NOT_CLOSABLE | B_NOT_RESIZABLE | B_NOT_ZOOMABLE,
         B_ALL_WORKSPACES),
     fRetainDesktopFocus(false)
@@ -446 +454 @@
     rect.top += 6;
     rect.bottom = rect.top + 15;
 
-    const char* caption = NULL;
+    BString caption;
     int32 id = 0;
 
     switch (type) {
         case kCopyState:
-            caption = "Preparing to copy items" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to copy items" B_UTF8_ELLIPSIS);
             id = R_CopyStatusBitmap;
             break;
 
         case kMoveState:
-            caption = "Preparing to move items" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to move items" B_UTF8_ELLIPSIS);
             id = R_MoveStatusBitmap;
             break;
 
         case kCreateLinkState:
-            caption = "Preparing to create links" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to create links" B_UTF8_ELLIPSIS);
             id = R_MoveStatusBitmap;
             break;
 
         case kTrashState:
-            caption = "Preparing to empty Trash" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to empty Trash" B_UTF8_ELLIPSIS);
             id = R_TrashStatusBitmap;
             break;
 
         case kVolumeState:
-            caption = "Searching for disks to mount" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Searching for disks to mount" B_UTF8_ELLIPSIS);
             break;
 
         case kDeleteState:
-            caption = "Preparing to delete items" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to delete items" B_UTF8_ELLIPSIS);
             id = R_TrashStatusBitmap;
             break;
 
         case kRestoreFromTrashState:
-            caption = "Preparing to restore items" B_UTF8_ELLIPSIS;
+            caption = B_TRANSLATE("Preparing to restore items" B_UTF8_ELLIPSIS);
             break;
 
         default:
@@ -488 +496 @@
             break;
     }
 
-    if (caption != NULL) {
-        fStatusBar = new BStatusBar(rect, "StatusBar", caption);
+    if (caption.Length()) {
+        fStatusBar = new BStatusBar(rect, "StatusBar", caption.String());
         fStatusBar->SetBarHeight(12);
         float width, height;
         fStatusBar->GetPreferredSize(&width, &height);
@@ -572 +580 @@
     }
 
     BString buffer;
-    if (totalItems > 0)
-        buffer << "of " << totalItems;
+    if (totalItems > 0) {
+        char totalStr[16];
+        buffer.SetTo(B_TRANSLATE("of %totalitems"));
+        sprintf(totalStr, "%ld",  totalItems);
+        buffer.ReplaceFirst("%totalitems", totalStr);
+    }
 
     switch (fType) {
         case kCopyState:
-            fStatusBar->Reset("Copying: ", buffer.String());
+            fStatusBar->Reset(
+                B_TRANSLATE("Copying: "),
+                buffer.String());
             break;
 
         case kCreateLinkState:
-            fStatusBar->Reset("Creating links: ", buffer.String());
+            fStatusBar->Reset(
+                B_TRANSLATE("Creating links: "),
+                buffer.String());
             break;
 
         case kMoveState:
-            fStatusBar->Reset("Moving: ", buffer.String());
+            fStatusBar->Reset(
+                B_TRANSLATE("Moving: "),
+                buffer.String());
             break;
 
         case kTrashState:
-            fStatusBar->Reset("Emptying Trash" B_UTF8_ELLIPSIS " ",
+            fStatusBar->Reset(
+                B_TRANSLATE("Emptying Trash" B_UTF8_ELLIPSIS " "),
                 buffer.String());
             break;
 
         case kDeleteState:
-            fStatusBar->Reset("Deleting: ", buffer.String());
+            fStatusBar->Reset(
+                B_TRANSLATE("Deleting: "),
+                buffer.String());
             break;
 
         case kRestoreFromTrashState:
-            fStatusBar->Reset("Restoring: ", buffer.String());
+            fStatusBar->Reset(
+                B_TRANSLATE("Restoring: "),
+                buffer.String());
             break;
 
         default:
@@ -650 +673 @@
     tp.y += ceilf(fh.leading) + ceilf(fh.ascent);
 
     if (IsPaused())
-        DrawString("Paused: click to resume or stop", tp);
+        DrawString(
+            B_TRANSLATE("Paused: click to resume or stop"),
+            tp);
     else if (fDestDir.Length()) {
         BString buffer;
         buffer << "To: " << fDestDir;
@@ -722 +747 @@
                     2, time->tm_hour, 2, time->tm_min);
             }
 
-            BString buffer1("Finish: ");
-            buffer1 << timeText;
             finishTime -= now;
             time = gmtime(&finishTime);
+            char finishStr[16];
 
-            BString buffer2;
-            if (finishTime > secondsPerDay)
-                buffer2 << "Over " << finishTime / secondsPerDay << " days";
-            else if (finishTime > 60 * 60)
-                buffer2 << "Over " << finishTime / (60 * 60) << " hours";
-            else if (finishTime > 60)
-                buffer2 << finishTime / 60 << " minutes";
-            else
-                buffer2 << finishTime << " seconds";
+            if (finishTime > secondsPerDay) {
+                buffer.SetTo(B_TRANSLATE("(Finish: %time - Over %finishtime days left)"));
+                sprintf(finishStr, "%ld", finishTime / secondsPerDay);
+            } else if (finishTime > 60 * 60) {
+                buffer.SetTo(B_TRANSLATE("(Finish: %time - Over %finishtime hours left)"));
+                sprintf(finishStr, "%ld", finishTime / (60 * 60));
+            } else if (finishTime > 60) {
+                buffer.SetTo(B_TRANSLATE("(Finish: %time - %finishtime minutes left)"));
+                sprintf(finishStr, "%ld", finishTime / 60);
+            } else {
+                buffer.SetTo(B_TRANSLATE("(Finish: %time - %finishtime seconds left)"));
+                sprintf(finishStr, "%ld", finishTime);
+            }
 
-            buffer2 << " left";
+        buffer.ReplaceFirst("%time", timeText);
+        buffer.ReplaceFirst("%finishtime", finishStr);
 
-            buffer = "(";
-            buffer << buffer1 << " - " << buffer2 << ")";
             tp.x = fStatusBar->Frame().right - StringWidth(buffer.String());
             if (tp.x > rightDivider)
                 DrawString(buffer.String(), tp);
             else {
                 // complete string too wide, try with shorter version
-                buffer = "(";
-                buffer << buffer1 << ")";
+                buffer.SetTo(B_TRANSLATE("(Finish: %time)"));
+                buffer.ReplaceFirst("%time", timeText);
                 tp.x = fStatusBar->Frame().right - StringWidth(buffer.String());
                 if (tp.x > rightDivider)
                     DrawString(buffer.String(), tp);

SlowContextPopup.cpp

@@ -38 +38 @@
 #include <Debug.h>
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Directory.h>
+#include <Locale.h>
 #include <Path.h>
 #include <Query.h>
 #include <StopWatch.h>
@@ -60 +62 @@
 #include "Tracker.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BSlowContextMenu::BSlowContextMenu(const char *title)
     :   BPopUpMenu(title, false, false),
         fMenuBuilt(false),
@@ -490 +496 @@
     fItemList->MakeEmpty();
 
     if (!count) {
-        BMenuItem *item = new BMenuItem("Empty folder", 0);
+        BMenuItem* item = new BMenuItem(
+            B_TRANSLATE("Empty folder"),
+            0);
         item->SetEnabled(false);
         AddItem(item);
     }

DeskWindow.cpp

@@ -32 +32 @@
 All rights reserved.
 */
 
+#include <Catalog.h>
 #include <Debug.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <NodeMonitor.h>
 #include <Path.h>
 #include <PopUpMenu.h>
@@ -103 +105 @@
 
 // #pragma mark -
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
 
 BDeskWindow::BDeskWindow(LockingList<BWindow> *windowList)
     :
@@ -266 +270 @@
 void
 BDeskWindow::AddWindowContextMenus(BMenu *menu)
 {
-    TemplatesMenu *tempateMenu = new TemplatesMenu(PoseView());
+    TemplatesMenu* tempateMenu = new TemplatesMenu(PoseView(),
+        B_TRANSLATE("New"));
 
     menu->AddItem(tempateMenu);
     tempateMenu->SetTargetForItems(PoseView());
@@ -274 +279 @@
 
     menu->AddSeparatorItem();
 
-    BMenu* iconSizeMenu = new BMenu("Icon view");
+    BMenu* iconSizeMenu = new BMenu(
+        B_TRANSLATE("Icon view"));
 
     BMessage* message = new BMessage(kIconMode);
     message->AddInt32("size", 32);
-    BMenuItem* item = new BMenuItem("32 x 32", message);
+    BMenuItem* item = new BMenuItem(
+        B_TRANSLATE("32 x 32"), message);
     item->SetMarked(PoseView()->IconSizeInt() == 32);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 40);
-    item = new BMenuItem("40 x 40", message);
+    item = new BMenuItem(
+        B_TRANSLATE("40 x 40"), message);
     item->SetMarked(PoseView()->IconSizeInt() == 40);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 48);
-    item = new BMenuItem("48 x 48", message);
+    item = new BMenuItem(
+        B_TRANSLATE("48 x 48"), message);
     item->SetMarked(PoseView()->IconSizeInt() == 48);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 64);
-    item = new BMenuItem("64 x 64", message);
+    item = new BMenuItem(
+        B_TRANSLATE("64 x 64"), message);
     item->SetMarked(PoseView()->IconSizeInt() == 64);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
@@ -308 +318 @@
 
     message = new BMessage(kIconMode);
     message->AddInt32("scale", 0);
-    item = new BMenuItem("Decrease size", message, '-');
+    item = new BMenuItem(
+        B_TRANSLATE("Decrease size"), message, '-');
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("scale", 1);
-    item = new BMenuItem("Increase size", message, '+');
+    item = new BMenuItem(
+        B_TRANSLATE("Increase size"), message, '+');
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
@@ -325 +337 @@
     iconSizeMenu->Superitem()->SetTarget(PoseView());
     iconSizeMenu->Superitem()->SetMarked(PoseView()->ViewMode() == kIconMode);
 
-    item = new BMenuItem("Mini icon view", new BMessage(kMiniIconMode), '2');
+    item = new BMenuItem(
+        B_TRANSLATE("Mini icon view"),
+        new BMessage(kMiniIconMode), '2');
     item->SetMarked(PoseView()->ViewMode() == kMiniIconMode);
     menu->AddItem(item);
 
     menu->AddSeparatorItem();
 
 #ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
-    BMenuItem *pasteItem;
-    menu->AddItem(pasteItem = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
+    BMenuItem* pasteItem;
+    menu->AddItem(pasteItem = new BMenuItem(
+        B_TRANSLATE("Paste"),
+        new BMessage(B_PASTE), 'V'));
     menu->AddSeparatorItem();
 #endif
-    menu->AddItem(new BMenuItem("Clean up", new BMessage(kCleanup), 'K'));
-    menu->AddItem(new BMenuItem("Select"B_UTF8_ELLIPSIS,
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Clean up"),
+        new BMessage(kCleanup), 'K'));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
         new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
-    menu->AddItem(new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A'));
 
     menu->AddSeparatorItem();
-    menu->AddItem(new MountMenu("Mount"));
+    menu->AddItem(
+        new MountMenu(B_TRANSLATE("Mount")));
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenu(kAddOnsMenuName));
+    menu->AddItem(
+        new BMenu(B_TRANSLATE("Add-ons")));
 
     // target items as needed
     menu->SetTargetForItems(PoseView());

Jamfile

@@ -3 +3 @@
 SetSubDirSupportedPlatformsBeOSCompatible ;
 AddSubDirSupportedPlatforms libbe_test ;
 
-UsePrivateHeaders interface mount shared storage tracker ;
+UsePrivateHeaders interface libbe mount shared storage tracker ;
 
 UseLibraryHeaders icon ;
 
-AddResources libtracker.so : TrackerIcons.rdef ;
+AddResources libtracker.so : TrackerIcons.rdef libTracker.rdef ;
 
 SubDirC++Flags
     -D_BUILDING_tracker=1 -DOPEN_TRACKER=1
@@ -91 +91 @@
     VolumeWindow.cpp
     WidgetAttributeText.cpp
 
-    : be translation $(vector_icon_libs) $(TARGET_LIBSTDC++) libshared.a
-
+    : be translation $(vector_icon_libs) $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) libshared.a
     ;
 
+DoCatalogs libtracker.so :
+    x-vnd.Haiku-libTracker
+    :
+    Tracker.cpp
+    AutoMounterSettings.cpp
+    ContainerWindow.cpp
+    CountView.cpp
+    DeskWindow.cpp
+    DirMenu.cpp
+    FavoritesMenu.cpp
+    FilePanelPriv.cpp
+    FilePermissionsView.cpp
+    FindPanel.cpp
+    FSClipboard.cpp
+    FSUtils.cpp
+    InfoWindow.cpp
+    Model.cpp
+    MountMenu.cpp
+    NavMenu.cpp
+    OpenWithWindow.cpp
+    PoseView.cpp
+    QueryContainerWindow.cpp
+    QueryPoseView.cpp
+    SelectionWindow.cpp
+    SettingsViews.cpp
+    SlowContextPopup.cpp
+    StatusWindow.cpp
+    TemplatesMenu.cpp
+    Tracker.cpp
+    TrackerInitialState.cpp
+    TrackerSettingsWindow.cpp
+    VolumeWindow.cpp
+    WidgetAttributeText.cpp
+;
+
+
 if $(TARGET_PLATFORM) = libbe_test {
     HaikuInstall install-test-apps : $(HAIKU_APP_TEST_LIB_DIR) : libtracker.so
         : tests!apps ;

QueryPoseView.cpp

@@ -35 +35 @@
 
 #include <new>
 
+#include <Catalog.h>
 #include <Debug.h>
+#include <Locale.h>
 #include <NodeMonitor.h>
 #include <Query.h>
 #include <Volume.h>
@@ -54 +56 @@
 
 #include <fs_attr.h>
 
+
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 using std::nothrow;
 
 // Currently filtering out Trash doesn't node monitor too well - if you
@@ -113 +120 @@
     if (fColumnList->CountItems() != 0)
         return;
 
-    fColumnList->AddItem(new BColumn("Name", kColumnStart, 145, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(
+        B_TRANSLATE("Name"),
+        kColumnStart, 145, B_ALIGN_LEFT,
         kAttrStatName, B_STRING_TYPE, true, true));
-    fColumnList->AddItem(new BColumn("Location", 200, 225, B_ALIGN_LEFT,
+    fColumnList->AddItem(
+        new BColumn(B_TRANSLATE("Location"),
+        200, 225, B_ALIGN_LEFT,
         kAttrPath, B_STRING_TYPE, true, false));
-    fColumnList->AddItem(new BColumn("Size", 440, 80, B_ALIGN_RIGHT,
+    fColumnList->AddItem(new BColumn(
+        B_TRANSLATE("Size"),
+        440, 80, B_ALIGN_RIGHT,
         kAttrStatSize, B_OFF_T_TYPE, true, false));
-    fColumnList->AddItem(new BColumn("Modified", 535, 150, B_ALIGN_LEFT,
+    fColumnList->AddItem(new BColumn(
+        B_TRANSLATE("Modified"),
+        535, 150, B_ALIGN_LEFT,
         kAttrStatModified, B_TIME_TYPE, true, false));
 }
 

FSClipboard.cpp

@@ -35 +35 @@
 #include "FSClipboard.h"
 #include <Clipboard.h>
 #include <Alert.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <NodeMonitor.h>
 #include "Commands.h"
 #include "FSUtils.h"
 #include "Tracker.h"
 
+
 // prototypes
 static void MakeNodeFromName(node_ref *node, char *name);
 static inline void MakeRefName(char *refName, const node_ref *node);
@@ -49 +52 @@
 
 
 //these are from PoseView.cpp
-extern const char *kNoCopyToTrashStr;
-extern const char *kNoCopyToRootStr;
-extern const char *kOkToMoveStr;
+//extern const char* kNoCopyToTrashStr;
+// extern const char *kOkToMoveStr;
 
 /*
 static bool
@@ -111 +113 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 bool
 FSClipboardHasRefs()
 {
@@ -468 +473 @@
 
     // can't copy/paste to root('/') directory
     if (model->IsRoot()) {
-        BAlert *alert = new BAlert("", kNoCopyToRootStr, "Cancel", 
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("You must drop items on one of the disk icons "
+    "in the \"Disks\" window."),
+            B_TRANSLATE("Cancel"),
             NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
@@ -480 +488 @@
 
     // can't copy items into the trash
     if (copyList->CountItems() > 0 && model->IsTrash()) {
-        BAlert *alert = new BAlert("", kNoCopyToTrashStr, "Cancel",
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("Sorry, you can't copy items to the Trash."),
+            B_TRANSLATE("Cancel"),
             NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();

PoseView.cpp

@@ -43 +43 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Catalog.h>
 #include <Clipboard.h>
 #include <Debug.h>
 #include <Dragger.h>
@@ -51 +52 @@
 #include <Screen.h>
 #include <Query.h>
 #include <List.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <NodeMonitor.h>
 #include <Path.h>
@@ -93 +95 @@
 #include "WidthBuffer.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 using std::min;
 using std::max;
 
@@ -4083 +4088 @@
         } else if (types)
             description = embedTypeAs;
 
-        const char *labelText;
-        char text[1024];
+        BString labelText;
         if (actionText) {
             int32 length = 1024 - 1 - (int32)strlen(actionText);
             if (length > 0) {
                 description.Truncate(length);
-                sprintf(text, actionText, description.String());
-                labelText = text;
+                labelText.SetTo(actionText);
+                labelText.ReplaceFirst("%s", description.String());
             } else
-                labelText = "label too long";
+                labelText.SetTo(B_TRANSLATE("label too long"));
         } else
-            labelText = description.String();
+            labelText = description;
 
-        menu->AddItem(new BMenuItem(labelText, 0));
+        menu->AddItem(new BMenuItem(labelText.String(), 0));
     }
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Cancel", 0));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Cancel"), 0));
 
     int32 result = -1;
     BMenuItem *resultingItem = menu->Go(where, false, true);
@@ -4254 +4258 @@
                         if (specificActionIndex == -1)
                             return false;
                     } else if (types.CountItems() > 0) {
-                        specificTypeIndex = RunMimeTypeDestinationMenu("Create %s clipping",
+                        specificTypeIndex = RunMimeTypeDestinationMenu(
+                            B_TRANSLATE("Create %s clipping"),
                             &types, &typeNames, view->ConvertToScreen(dropPt));
 
                         if (specificTypeIndex == -1)

AutoMounterSettings.cpp

@@ -37 +37 @@
 #include <Alert.h>
 #include <Box.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <Debug.h>
 #include <GridLayoutBuilder.h>
 #include <GroupLayoutBuilder.h>
+#include <Locale.h>
 #include <SpaceLayoutItem.h>
 #include <SeparatorView.h>
 #include <Message.h>
@@ -54 +56 @@
 const uint32 kBootMountSettingsChanged = 'bchg';
 const uint32 kEjectWhenUnmountingChanged = 'ejct';
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
 
 class AutomountSettingsPanel : public BBox {
 public:
@@ -103 +107 @@
 
     BBox* autoMountBox = new BBox("autoMountBox", B_WILL_DRAW | B_FRAME_EVENTS
         | B_PULSE_NEEDED | B_NAVIGABLE_JUMP);
-    autoMountBox->SetLabel("Automatic disk mounting");
+    autoMountBox->SetLabel(B_TRANSLATE("Automatic disk mounting"));
     BGroupLayout* autoMountLayout = new BGroupLayout(B_VERTICAL, spacing);
     autoMountBox->SetLayout(autoMountLayout);
     autoMountLayout->SetInsets(spacing,
         autoMountBox->InnerFrame().top + spacing, spacing, spacing);
 
-    fScanningDisabledCheck = new BRadioButton("scanningOff", "Don't automount",
+    fScanningDisabledCheck = new BRadioButton("scanningOff",
+        B_TRANSLATE("Don't automount"),
         new BMessage(kAutomountSettingsChanged));
 
-    fAutoMountAllBFSCheck = new BRadioButton("autoBFS", "All BeOS disks",
+    fAutoMountAllBFSCheck = new BRadioButton("autoBFS",
+        B_TRANSLATE("All BeOS disks"),
         new BMessage(kAutomountSettingsChanged));
 
-    fAutoMountAllCheck = new BRadioButton("autoAll", "All disks",
+    fAutoMountAllCheck = new BRadioButton("autoAll",
+        B_TRANSLATE("All disks"),
         new BMessage(kAutomountSettingsChanged));
 
     // "Disk Mounting During Boot" group
 
     BBox* bootMountBox = new BBox("", B_WILL_DRAW | B_FRAME_EVENTS
         | B_PULSE_NEEDED | B_NAVIGABLE_JUMP);
-    bootMountBox->SetLabel("Disk mounting during boot");
+    bootMountBox->SetLabel(B_TRANSLATE("Disk mounting during boot"));
     BGroupLayout* bootMountLayout = new BGroupLayout(B_VERTICAL, spacing);
     bootMountBox->SetLayout(bootMountLayout);
     bootMountLayout->SetInsets(spacing,
         bootMountBox->InnerFrame().top + spacing, spacing, spacing);
 
     fInitialDontMountCheck = new BRadioButton("initialNone",
-        "Only the boot disk", new BMessage(kBootMountSettingsChanged));
+        B_TRANSLATE("Only the boot disk"),
+        new BMessage(kBootMountSettingsChanged));
 
     fInitialMountRestoreCheck = new BRadioButton("initialRestore",
-        "Previously mounted disks", new BMessage(kBootMountSettingsChanged));
+        B_TRANSLATE("Previously mounted disks"),
+        new BMessage(kBootMountSettingsChanged));
 
     fInitialMountAllBFSCheck = new BRadioButton("initialBFS",
-        "All BeOS disks", new BMessage(kBootMountSettingsChanged));
+        B_TRANSLATE("All BeOS disks"),
+        new BMessage(kBootMountSettingsChanged));
 
     fInitialMountAllCheck = new BRadioButton("initialAll",
-        "All disks", new BMessage(kBootMountSettingsChanged));
+        B_TRANSLATE("All disks"),
+        new BMessage(kBootMountSettingsChanged));
 
     fEjectWhenUnmountingCheckBox = new BCheckBox("ejectWhenUnmounting",
-        "Eject when unmounting", new BMessage(kEjectWhenUnmountingChanged));
+        B_TRANSLATE("Eject when unmounting"),
+        new BMessage(kEjectWhenUnmountingChanged));
 
     // Buttons
 
-    fDone = new BButton("Done", new BMessage(B_QUIT_REQUESTED));
+    fDone = new BButton(B_TRANSLATE("Done"),
+        new BMessage(B_QUIT_REQUESTED));
 
-    fMountAllNow = new BButton("mountAll", "Mount all disks now",
+    fMountAllNow = new BButton("mountAll",
+        B_TRANSLATE("Mount all disks now"),
         new BMessage(kMountAllNow));
 
     fDone->MakeDefault(true);
@@ -292 +306 @@
 AutomountSettingsDialog::AutomountSettingsDialog(BMessage* settings,
         const BMessenger& target)
     :
-    BWindow(BRect(100, 100, 320, 370), "Disk mount settings",
+    BWindow(BRect(100, 100, 320, 370),
+        B_TRANSLATE("Disk mount settings"),
         B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
             | B_AUTO_UPDATE_SIZE_LIMITS)
 {
@@ -325 +340 @@
     BMessage reply;
     status_t ret = target.SendMessage(&message, &reply, 2500000);
     if (ret != B_OK) {
-        (new BAlert("Mount server error", "The mount server could not be "
-            "contacted.", "OK", NULL, NULL, B_WIDTH_AS_USUAL,
-            B_STOP_ALERT))->Go();
+        (new BAlert(B_TRANSLATE("Mount server error"),
+            B_TRANSLATE("The mount server could not be  contacted."),
+            B_TRANSLATE("OK"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
         return;
     }
 

ContainerWindow.cpp

@@ -39 +39 @@
 #include <Alert.h>
 #include <Application.h>
 #include <AppFileInfo.h>
+#include <Catalog.h>
 #include <ControlLook.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <FindDirectory.h>
 #include <InterfaceDefs.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <MenuBar.h>
 #include <NodeMonitor.h>
@@ -89 +91 @@
 #include "TemplatesMenu.h"
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 const uint32 kRedo = 'REDO';
     // this is the same as B_REDO in Dano/Zeta/Haiku
 
@@ -103 +108 @@
 
 namespace BPrivate {
 
-const char *kAddOnsMenuName = "Add-ons";
-
 class DraggableContainerIcon : public BView {
     public:
         DraggableContainerIcon(BRect rect, const char *name, uint32 resizeMask);
@@ -261 +264 @@
             result = addonImage;
     }
 
-    char buffer[1024];
-    sprintf(buffer, "Error %s loading Add-On %s.", strerror(result), addonRef.name);
+    BString buffer(B_TRANSLATE("Error %error loading Add-On %name."));
+    buffer.ReplaceFirst("%error", strerror(result));
+    buffer.ReplaceFirst("%name", addonRef.name);
 
-    BAlert *alert = new BAlert("", buffer, "Cancel", 0, 0,
-        B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    BAlert* alert = new BAlert("", buffer.String(),
+        B_TRANSLATE("Cancel"),
+        0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
     alert->SetShortcut(0, B_ESCAPE);
     alert->Go();
 
@@ -406 +411 @@
     float height = fontHeight.ascent + fontHeight.descent + fontHeight.leading + 2
         + Bounds().Height() + 8;
 
-    BRect rect(0, 0, max_c(Bounds().Width(), font.StringWidth(model->Name()) + 4), height);
-    BBitmap *dragBitmap = new BBitmap(rect, B_RGBA32, true);
+    BRect rect(0, 0, max_c(Bounds().Width(),
+        font.StringWidth(model->Name()) + 4), height);
+    BBitmap* dragBitmap = new BBitmap(rect, B_RGBA32, true);
 
     dragBitmap->Lock();
     BView *view = new BView(dragBitmap->Bounds(), "", B_FOLLOW_NONE, 0);
@@ -853 +859 @@
 
     fMenuBar->RemoveItem(fFileMenu);
     delete fFileMenu;
-    fFileMenu = new BMenu("File");
+    fFileMenu = new BMenu(B_TRANSLATE("File"));
     AddFileMenu(fFileMenu);
     fMenuBar->AddItem(fFileMenu);
 
     fMenuBar->RemoveItem(fWindowMenu);
     delete fWindowMenu;
-    fWindowMenu = new BMenu("Window");
+    fWindowMenu = new BMenu(B_TRANSLATE("Window"));
     fMenuBar->AddItem(fWindowMenu);
     AddWindowMenu(fWindowMenu);
 
     // just create the attribute, decide to add it later
     fMenuBar->RemoveItem(fAttrMenu);
     delete fAttrMenu;
-    fAttrMenu = new BMenu("Attributes");
+    fAttrMenu = new BMenu(B_TRANSLATE("Attributes"));
     NewAttributeMenu(fAttrMenu);
     if (PoseView()->ViewMode() == kListMode)
         ShowAttributeMenu();
@@ -897 +903 @@
     if (ShouldAddScrollBars())
         fPoseView->AddScrollBars();
 
-    fMoveToItem = new BMenuItem(new BNavMenu("Move to", kMoveSelectionTo, this));
-    fCopyToItem = new BMenuItem(new BNavMenu("Copy to", kCopySelectionTo, this));
-    fCreateLinkItem = new BMenuItem(new BNavMenu("Create link", kCreateLink, this),
-        new BMessage(kCreateLink));
+    fMoveToItem = new BMenuItem(new BNavMenu(B_TRANSLATE("Move to"),
+        kMoveSelectionTo, this));
+    fCopyToItem = new BMenuItem(new BNavMenu(B_TRANSLATE("Copy to"),
+        kCopySelectionTo, this));
+    fCreateLinkItem = new BMenuItem(new BNavMenu(B_TRANSLATE("Create link"),
+        kCreateLink, this), new BMessage(kCreateLink));
 
     TrackerSettings settings;
 
@@ -1635 +1643 @@
 
                             BMenuItem *item = fFileContextMenu->FindItem(kMoveToTrash);
                             if (item)
-                                item->SetLabel(dontMoveToTrash ? "Delete" : "Move to Trash");
+                                item->SetLabel(dontMoveToTrash
+                                    ? B_TRANSLATE("Delete")
+                                    : B_TRANSLATE("Move to Trash"));
 
                             // Deskbar doesn't have a menu bar, so check if there is fMenuBar
                             if (fMenuBar && fFileMenu) {
                                 item = fFileMenu->FindItem(kMoveToTrash);
                                 if (item)
-                                    item->SetLabel(dontMoveToTrash ? "Delete" : "Move to Trash");
+                                    item->SetLabel(dontMoveToTrash
+                                        ? B_TRANSLATE("Delete")
+                                        : B_TRANSLATE("Move to Trash"));
                             }
                             UpdateIfNeeded();
                         }
@@ -1685 +1697 @@
         || PoseView() != CurrentFocus());
 
     if (modifiers() & B_SHIFT_KEY) {
-        item->SetLabel("Cut more");
+        item->SetLabel(B_TRANSLATE("Cut more"));
         item->SetShortcut('X', B_COMMAND_KEY | B_SHIFT_KEY);
         item->SetMessage(new BMessage(kCutMoreSelectionToClipboard));
     } else {
-        item->SetLabel("Cut");
+        item->SetLabel(B_TRANSLATE("Cut"));
         item->SetShortcut('X', B_COMMAND_KEY);
         item->SetMessage(new BMessage(B_CUT));
     }
@@ -1708 +1720 @@
         || PoseView() != CurrentFocus());
 
     if (modifiers() & B_SHIFT_KEY) {
-        item->SetLabel("Copy more");
+        item->SetLabel(B_TRANSLATE("Copy more"));
         item->SetShortcut('C', B_COMMAND_KEY | B_SHIFT_KEY);
         item->SetMessage(new BMessage(kCopyMoreSelectionToClipboard));
     } else {
-        item->SetLabel("Copy");
+        item->SetLabel(B_TRANSLATE("Copy"));
         item->SetShortcut('C', B_COMMAND_KEY);
         item->SetMessage(new BMessage(B_COPY));
     }
@@ -1730 +1742 @@
     item->SetEnabled(FSClipboardHasRefs() || PoseView() != CurrentFocus());
 
     if (modifiers() & B_SHIFT_KEY) {
-        item->SetLabel("Paste links");
+        item->SetLabel(B_TRANSLATE("Paste links"));
         item->SetShortcut('V', B_COMMAND_KEY | B_SHIFT_KEY);
         item->SetMessage(new BMessage(kPasteLinksFromClipboard));
     } else {
-        item->SetLabel("Paste");
+        item->SetLabel(B_TRANSLATE("Paste"));
         item->SetShortcut('V', B_COMMAND_KEY);
         item->SetMessage(new BMessage(B_PASTE));
     }
@@ -1753 +1765 @@
         && (PoseView()->ViewMode() != kListMode));
 
     if (modifiers() & B_SHIFT_KEY) {
-        item->SetLabel("Clean up all");
+        item->SetLabel(B_TRANSLATE("Clean up all"));
         item->SetShortcut('K', B_COMMAND_KEY | B_SHIFT_KEY);
         item->SetMessage(new BMessage(kCleanupAll));
     } else {
-        item->SetLabel("Clean up");
+        item->SetLabel(B_TRANSLATE("Clean up"));
         item->SetShortcut('K', B_COMMAND_KEY);
         item->SetMessage(new BMessage(kCleanup));
     }
@@ -1773 +1785 @@
         return;
 
     if (modifiers() & B_SHIFT_KEY) {
-        item->SetLabel("Close all");
+        item->SetLabel(B_TRANSLATE("Close all"));
         item->SetShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY);
         item->SetTarget(be_app);
         item->SetMessage(new BMessage(kCloseAllWindows));
     } else {
-        item->SetLabel("Close");
+        item->SetLabel(B_TRANSLATE("Close"));
         item->SetShortcut('W', B_COMMAND_KEY);
         item->SetTarget(this);
         item->SetMessage(new BMessage(B_QUIT_REQUESTED));
@@ -1803 +1815 @@
 void
 BContainerWindow::AddMenus()
 {
-    fFileMenu = new BMenu("File");
+    fFileMenu = new BMenu(B_TRANSLATE("File"));
     AddFileMenu(fFileMenu);
     fMenuBar->AddItem(fFileMenu);
-    fWindowMenu = new BMenu("Window");
+    fWindowMenu = new BMenu(B_TRANSLATE("Window"));
     fMenuBar->AddItem(fWindowMenu);
     AddWindowMenu(fWindowMenu);
     // just create the attribute, decide to add it later
-    fAttrMenu = new BMenu("Attributes");
+    fAttrMenu = new BMenu(B_TRANSLATE("Attributes"));
     NewAttributeMenu(fAttrMenu);
 }
 
@@ -1819 +1831 @@
 BContainerWindow::AddFileMenu(BMenu *menu)
 {
     if (!PoseView()->IsFilePanel())
-        menu->AddItem(new BMenuItem("Find"B_UTF8_ELLIPSIS,
+        menu->AddItem(new BMenuItem(
+            B_TRANSLATE("Find"B_UTF8_ELLIPSIS),
             new BMessage(kFindButton), 'F'));
 
     if (!TargetModel()->IsQuery() && !IsTrash() && !IsPrintersDir()) {
         if (!PoseView()->IsFilePanel()) {
-            TemplatesMenu *templateMenu = new TemplatesMenu(PoseView());
+            TemplatesMenu* templateMenu = new TemplatesMenu(PoseView(),
+                B_TRANSLATE("New"));
             menu->AddItem(templateMenu);
             templateMenu->SetTargetForItems(PoseView());
         } else
-            menu->AddItem(new BMenuItem("New folder", new BMessage(kNewFolder), 'N'));
+            menu->AddItem(
+                new BMenuItem(B_TRANSLATE("New folder"),
+                new BMessage(kNewFolder), 'N'));
     }
     menu->AddSeparatorItem();
 
-    menu->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
 
     if (IsTrash() || InTrash()) {
-        menu->AddItem(new BMenuItem("Restore", new BMessage(kRestoreFromTrash)));
+        menu->AddItem(new BMenuItem(B_TRANSLATE("Restore"),
+            new BMessage(kRestoreFromTrash)));
         if (IsTrash()) {
             // add as first item in menu
-            menu->AddItem(new BMenuItem("Empty Trash", new BMessage(kEmptyTrash)), 0);
+            menu->AddItem(
+                new BMenuItem(B_TRANSLATE("Empty Trash"),
+                new BMessage(kEmptyTrash)), 0);
             menu->AddItem(new BSeparatorItem(), 1);
         }
     } else if (IsPrintersDir()) {
-        menu->AddItem(new BMenuItem("Add printer"B_UTF8_ELLIPSIS,
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Add printer"B_UTF8_ELLIPSIS),
             new BMessage(kAddPrinter), 'N'), 0);
         menu->AddItem(new BSeparatorItem(), 1);
-        menu->AddItem(new BMenuItem("Make active printer",
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Make active printer"),
             new BMessage(kMakeActivePrinter)));
     } else {
-        menu->AddItem(new BMenuItem("Duplicate",new BMessage(kDuplicateSelection), 'D'));
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Duplicate"),
+            new BMessage(kDuplicateSelection), 'D'));
 
-        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash() ?
-                "Delete" : "Move to Trash",
-                new BMessage(kMoveToTrash), 'T'));
+        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+            ?B_TRANSLATE("Delete")
+            : B_TRANSLATE("Move to Trash"),
+            new BMessage(kMoveToTrash), 'T'));
 
         menu->AddSeparatorItem();
 
@@ -1867 +1894 @@
     if (!IsPrintersDir()) {
         menu->AddSeparatorItem();
 
-        menu->AddItem(cutItem = new BMenuItem("Cut", new BMessage(B_CUT), 'X'));
-        menu->AddItem(copyItem = new BMenuItem("Copy", new BMessage(B_COPY), 'C'));
-        menu->AddItem(pasteItem = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
+        menu->AddItem(
+            cutItem = new BMenuItem(B_TRANSLATE("Cut"),
+            new BMessage(B_CUT), 'X'));
+        menu->AddItem(
+            copyItem = new BMenuItem(B_TRANSLATE("Copy"),
+            new BMessage(B_COPY), 'C'));
+        menu->AddItem(
+            pasteItem = new BMenuItem(B_TRANSLATE("Paste"),
+            new BMessage(B_PASTE), 'V'));
 
         menu->AddSeparatorItem();
 
-        menu->AddItem(new BMenuItem("Identify", new BMessage(kIdentifyEntry)));
-        BMenu *addOnMenuItem = new BMenu(kAddOnsMenuName);
+        menu->AddItem(new BMenuItem(
+            B_TRANSLATE("Identify"),
+            new BMessage(kIdentifyEntry)));
+        BMenu* addOnMenuItem = new BMenu(
+            B_TRANSLATE("Add-ons"));
         addOnMenuItem->SetFont(be_plain_font);
         menu->AddItem(addOnMenuItem);
     }
@@ -1894 +1930 @@
 {
     BMenuItem *item;
 
-    BMenu* iconSizeMenu = new BMenu("Icon view");
+    BMenu* iconSizeMenu = new BMenu(
+        B_TRANSLATE("Icon view"));
 
     BMessage* message = new BMessage(kIconMode);
     message->AddInt32("size", 32);
-    item = new BMenuItem("32 x 32", message);
+    item = new BMenuItem(
+        B_TRANSLATE("32 x 32"), message);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 40);
-    item = new BMenuItem("40 x 40", message);
+    item = new BMenuItem(
+        B_TRANSLATE("40 x 40"), message);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 48);
-    item = new BMenuItem("48 x 48", message);
+    item = new BMenuItem(
+        B_TRANSLATE("48 x 48"), message);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("size", 64);
-    item = new BMenuItem("64 x 64", message);
+    item = new BMenuItem(
+        B_TRANSLATE("64 x 64"), message);
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
@@ -1924 +1965 @@
 
     message = new BMessage(kIconMode);
     message->AddInt32("scale", 0);
-    item = new BMenuItem("Decrease size", message, '-');
+    item = new BMenuItem(
+        B_TRANSLATE("Decrease size"), message, '-');
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
     message = new BMessage(kIconMode);
     message->AddInt32("scale", 1);
-    item = new BMenuItem("Increase size", message, '+');
+    item = new BMenuItem(
+        B_TRANSLATE("Increase size"), message, '+');
     item->SetTarget(PoseView());
     iconSizeMenu->AddItem(item);
 
@@ -1940 +1983 @@
     iconSizeMenu->Superitem()->SetMessage(new BMessage(kIconMode));
     iconSizeMenu->Superitem()->SetTarget(PoseView());
 
-    item = new BMenuItem("Mini icon view", new BMessage(kMiniIconMode), '2');
+    item = new BMenuItem(B_TRANSLATE("Mini icon view"),
+        new BMessage(kMiniIconMode), '2');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("List view", new BMessage(kListMode), '3');
+    item = new BMenuItem(B_TRANSLATE("List view"),
+        new BMessage(kListMode), '3');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
     menu->AddSeparatorItem();
 
-    item = new BMenuItem("Resize to fit", new BMessage(kResizeToFit), 'Y');
+    item = new BMenuItem(B_TRANSLATE("Resize to fit"),
+        new BMessage(kResizeToFit), 'Y');
     item->SetTarget(this);
     menu->AddItem(item);
 
-    item = new BMenuItem("Clean up", new BMessage(kCleanup), 'K');
+    item = new BMenuItem(B_TRANSLATE("Clean up"),
+        new BMessage(kCleanup), 'K');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Select"B_UTF8_ELLIPSIS,
+    item = new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
         new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A');
+    item = new BMenuItem(B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Invert selection", new BMessage(kInvertSelection),
+    item = new BMenuItem(B_TRANSLATE("Invert selection"),
+        new BMessage(kInvertSelection),
         'S');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
     if (!IsTrash()) {
-        item = new BMenuItem("Open parent", new BMessage(kOpenParentDir),
+        item = new BMenuItem(B_TRANSLATE("Open parent"),
+            new BMessage(kOpenParentDir),
             B_UP_ARROW);
         item->SetTarget(PoseView());
         menu->AddItem(item);
     }
 
-    item = new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W');
+    item = new BMenuItem(B_TRANSLATE("Close"),
+        new BMessage(B_QUIT_REQUESTED), 'W');
     item->SetTarget(this);
     menu->AddItem(item);
 
-    item = new BMenuItem("Close all in workspace",
+    item = new BMenuItem(
+        B_TRANSLATE("Close all in workspace"),
         new BMessage(kCloseAllInWorkspace), 'Q');
     item->SetTarget(be_app);
     menu->AddItem(item);
 
     menu->AddSeparatorItem();
 
-    item = new BMenuItem("Preferences"B_UTF8_ELLIPSIS,
+    item = new BMenuItem(
+        B_TRANSLATE("Preferences"B_UTF8_ELLIPSIS),
         new BMessage(kShowSettingsWindow));
     item->SetTarget(be_app);
     menu->AddItem(item);
@@ -2051 +2105 @@
     AddMimeTypesToMenu(fAttrMenu);
 
     if (IsPrintersDir())
-        EnableNamedMenuItem(fFileMenu, "Make active printer", selectCount == 1);
+        EnableNamedMenuItem(fFileMenu,
+            B_TRANSLATE("Make active printer"),
+            selectCount == 1);
 }
 
 
@@ -2163 +2219 @@
     bool poseViewIsQuery = TargetModel()->IsQuery();
         // if the view is a query pose view, add edit query menu item
 
-    BMenuItem *item = menu->FindItem("Edit query");
+    BMenuItem* item = menu->FindItem(
+        B_TRANSLATE("Edit query"));
     if (!poseViewIsQuery && !queryInSelection && item)
         item->Menu()->RemoveItem(item);
 
@@ -2173 +2230 @@
         item = menu->FindItem(kOpenSelection);
         if (item) {
             int32 itemIndex = item->Menu()->IndexOf(item);
-            BMenuItem *query = new BMenuItem("Edit query", new BMessage(kEditQuery), 'G');
+            BMenuItem* query = new BMenuItem(B_TRANSLATE("Edit query"),
+                new BMessage(kEditQuery), 'G');
             item->Menu()->AddItem(query, itemIndex + 1);
             query->SetTarget(PoseView());
         }
@@ -2225 +2283 @@
 
     int32 index = item->Menu()->IndexOf(item);
     fOpenWithItem = new BMenuItem(
-        new OpenWithMenu("Open with"B_UTF8_ELLIPSIS, &message, this, be_app),
-        new BMessage(kOpenSelectionWith));
+        new OpenWithMenu(
+            B_TRANSLATE("Open with"B_UTF8_ELLIPSIS),
+            &message, this, be_app), new BMessage(kOpenSelectionWith));
     fOpenWithItem->SetTarget(PoseView());
     fOpenWithItem->SetShortcut('O', B_COMMAND_KEY | B_CONTROL_KEY);
 
@@ -2260 +2319 @@
     if (entry.SetTo(ref) == B_OK
         && entry.GetParent(&entry) == B_OK
         && model.SetTo(&entry) == B_OK) {
-        BNavMenu *menu = new BNavMenu("Current folder",what,this);
+        BNavMenu* menu = new BNavMenu(B_TRANSLATE("Current folder"),
+            what, this);
         menu->SetNavDir(model.EntryRef());
         menu->SetShowParent(true);
 
@@ -2276 +2336 @@
         path.Append("Tracker");
         if (entry.SetTo(path.Path()) == B_OK
             && model.SetTo(&entry) == B_OK) {
-            BMenu *menu = new RecentsMenu("Recent folders",kRecentFolders,what,this);
+            BMenu* menu = new RecentsMenu(B_TRANSLATE("Recent folders"),
+                kRecentFolders, what, this);
 
             BMenuItem *item = new SpecialModelMenuItem(&model,menu);
             item->SetMessage(new BMessage((uint32)what));
@@ -2375 +2436 @@
     // Set the "Create Link" item label here so it
     // appears correctly when menus are disabled, too.
     if (modifierKeys & B_SHIFT_KEY)
-        fCreateLinkItem->SetLabel("Create relative link");
+        fCreateLinkItem->SetLabel(
+            B_TRANSLATE("Create relative link"));
     else
-        fCreateLinkItem->SetLabel("Create link");
+        fCreateLinkItem->SetLabel(
+            B_TRANSLATE("Create link"));
 
     // only enable once the menus are built
     fMoveToItem->SetEnabled(false);
@@ -2425 +2488 @@
     BMenuItem *identifyItem = parent->FindItem(kIdentifyEntry);
     if (identifyItem != NULL) {
         if (modifierKeys & B_SHIFT_KEY)
-            identifyItem->SetLabel("Force identify");
+            identifyItem->SetLabel(
+                B_TRANSLATE("Force identify"));
         else
-            identifyItem->SetLabel("Identify");
+            identifyItem->SetLabel(
+                B_TRANSLATE("Identify"));
     }
 }
 
@@ -2446 +2511 @@
     if (item == NULL)
         item = fDropContextMenu->FindItem(kCreateRelativeLink);
     if (item && (modifiers() & B_SHIFT_KEY)) {
-        item->SetLabel("Create relative link here");
+        item->SetLabel(
+            B_TRANSLATE("Create relative link here"));
         item->SetMessage(new BMessage(kCreateRelativeLink));
     } else if (item) {
-        item->SetLabel("Create link here");
+        item->SetLabel(
+            B_TRANSLATE("Create link here"));
         item->SetMessage(new BMessage(kCreateLink));
     }
 
@@ -2572 +2639 @@
                         if (volume != boot)
                             ejectableVolumeSelected = true;
         
-                        EnableNamedMenuItem(fContextMenu, "Unmount", ejectableVolumeSelected);
+                        EnableNamedMenuItem(fContextMenu, B_TRANSLATE("Unmount"),
+                            ejectableVolumeSelected);
                     }
                 }
         
@@ -2607 +2675 @@
 void
 BContainerWindow::AddFileContextMenus(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
 
     if (!IsTrash() && !InTrash() && !IsPrintersDir())
-        menu->AddItem(new BMenuItem("Duplicate",
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Duplicate"),
             new BMessage(kDuplicateSelection), 'D'));
 
     if (!IsTrash() && !InTrash()) {
-        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash() ?
-                "Delete" : "Move to Trash",
-                new BMessage(kMoveToTrash), 'T'));
+        menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
+            ?B_TRANSLATE("Delete")
+            : B_TRANSLATE("Move to Trash"),
+            new BMessage(kMoveToTrash), 'T'));
 
         // add separator for copy to/move to items (navigation items)
         menu->AddSeparatorItem();
     } else {
-        menu->AddItem(new BMenuItem("Delete", new BMessage(kDelete), 0));
-        menu->AddItem(new BMenuItem("Restore", new BMessage(kRestoreFromTrash), 0));
+        menu->AddItem(new BMenuItem(B_TRANSLATE("Delete"),
+            new BMessage(kDelete), 0));
+        menu->AddItem(new BMenuItem(B_TRANSLATE("Restore"),
+            new BMessage(kRestoreFromTrash), 0));
     }
 
 #ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
     menu->AddSeparatorItem();
     BMenuItem *cutItem, *copyItem;
-    menu->AddItem(cutItem = new BMenuItem("Cut", new BMessage(B_CUT), 'X'));
-    menu->AddItem(copyItem = new BMenuItem("Copy", new BMessage(B_COPY), 'C'));
+    menu->AddItem(
+        cutItem = new BMenuItem(B_TRANSLATE("Cut"),
+        new BMessage(B_CUT), 'X'));
+    menu->AddItem(
+        copyItem = new BMenuItem(B_TRANSLATE("Copy"),
+        new BMessage(B_COPY), 'C'));
 #endif
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Identify", new BMessage(kIdentifyEntry)));
-    BMenu *addOnMenuItem = new BMenu(kAddOnsMenuName);
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Identify"),
+        new BMessage(kIdentifyEntry)));
+    BMenu* addOnMenuItem =
+        new BMenu(B_TRANSLATE("Add-ons"));
     addOnMenuItem->SetFont(be_plain_font);
     menu->AddItem(addOnMenuItem);
 
@@ -2652 +2733 @@
 void
 BContainerWindow::AddVolumeContextMenus(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Open", new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info", new BMessage(kGetInfo), 'I'));
-    menu->AddItem(new BMenuItem("Edit name", new BMessage(kEditItem), 'E'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Open"),
+        new BMessage(kOpenSelection), 'O'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
+        new BMessage(kGetInfo), 'I'));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Edit name"),
+        new BMessage(kEditItem), 'E'));
 
     menu->AddSeparatorItem();
-    menu->AddItem(new MountMenu("Mount"));
+    menu->AddItem(new MountMenu(B_TRANSLATE("Mount")));
 
-    BMenuItem *item = new BMenuItem("Unmount", new BMessage(kUnmountVolume), 'U');
+    BMenuItem *item = new BMenuItem(
+        B_TRANSLATE("Unmount"),
+        new BMessage(kUnmountVolume), 'U');
     item->SetEnabled(false);
     menu->AddItem(item);
 
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenu(kAddOnsMenuName));
+    menu->AddItem(new BMenu(B_TRANSLATE("Add-ons")));
 
     menu->SetTargetForItems(PoseView());
 }
@@ -2679 +2765 @@
 
     bool needSeparator = true;
     if (IsTrash())
-        menu->AddItem(new BMenuItem("Empty Trash", new BMessage(kEmptyTrash)));
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Empty Trash"),
+            new BMessage(kEmptyTrash)));
     else if (IsPrintersDir())
-        menu->AddItem(new BMenuItem("Add printer"B_UTF8_ELLIPSIS, new BMessage(kAddPrinter), 'N'));
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Add printer"B_UTF8_ELLIPSIS),
+            new BMessage(kAddPrinter), 'N'));
     else if (InTrash())
         needSeparator = false;
     else {
-        TemplatesMenu *templateMenu = new TemplatesMenu(PoseView());
+        TemplatesMenu* templateMenu = new TemplatesMenu(PoseView(),
+            B_TRANSLATE("New"));
         menu->AddItem(templateMenu);
         templateMenu->SetTargetForItems(PoseView());
         templateMenu->SetFont(be_plain_font);
@@ -2699 +2790 @@
     menu->AddItem(pasteItem);
     menu->AddSeparatorItem();
 #endif
-    menu->AddItem(new BMenuItem("Clean up", new BMessage(kCleanup), 'K'));
-    menu->AddItem(new BMenuItem("Select"B_UTF8_ELLIPSIS,
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Clean up"),
+        new BMessage(kCleanup), 'K'));
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
         new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
-    menu->AddItem(new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A'));
     if (!IsTrash())
-        menu->AddItem(new BMenuItem("Open parent", new BMessage(kOpenParentDir),
-            B_UP_ARROW));
+        menu->AddItem(
+            new BMenuItem(B_TRANSLATE("Open parent"),
+            new BMessage(kOpenParentDir), B_UP_ARROW));
 
     menu->AddSeparatorItem();
-    BMenu *addOnMenuItem = new BMenu(kAddOnsMenuName);
+    BMenu* addOnMenuItem = new BMenu(
+        B_TRANSLATE("Add-ons"));
     addOnMenuItem->SetFont(be_plain_font);
     menu->AddItem(addOnMenuItem);
 
@@ -2729 +2827 @@
 void
 BContainerWindow::AddDropContextMenus(BMenu *menu)
 {
-    menu->AddItem(new BMenuItem("Create link here", new BMessage(kCreateLink)));
-    menu->AddItem(new BMenuItem("Move here", new BMessage(kMoveSelectionTo)));
-    menu->AddItem(new BMenuItem("Copy here", new BMessage(kCopySelectionTo)));
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Create link here"),
+        new BMessage(kCreateLink)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Move here"),
+        new BMessage(kMoveSelectionTo)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Copy here"),
+        new BMessage(kCopySelectionTo)));
     menu->AddSeparatorItem();
-    menu->AddItem(new BMenuItem("Cancel", new BMessage(kCancelButton)));
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Cancel"),
+        new BMessage(kCancelButton)));
 }
 
 
@@ -2741 +2844 @@
 BContainerWindow::AddTrashContextMenus(BMenu *menu)
 {
     // setup special trash context menu
-    menu->AddItem(new BMenuItem("Empty Trash",
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("Empty Trash"),
         new BMessage(kEmptyTrash)));
-    menu->AddItem(new BMenuItem("Open",
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Open"),
         new BMessage(kOpenSelection), 'O'));
-    menu->AddItem(new BMenuItem("Get info",
+    menu->AddItem(new BMenuItem(B_TRANSLATE("Get info"),
         new BMessage(kGetInfo), 'I'));
     menu->SetTargetForItems(PoseView());
 }
@@ -2887 +2991 @@
 void
 BContainerWindow::BuildAddOnMenu(BMenu *menu)
 {
-    BMenuItem *item = menu->FindItem(kAddOnsMenuName);
+    BMenuItem* item = menu->FindItem(
+        B_TRANSLATE("Add-ons"));
     if (menu->IndexOf(item) == 0) {
         // the folder of the context menu seems to be named "Add-Ons"
         // so we just take the last menu item, which is correct if not
@@ -2965 +3070 @@
 
     if (context == kMenuBarContext || context == kWindowPopUpContext) {
         BMenu* sizeMenu = NULL;
-        if (BMenuItem* item = menu->FindItem("Icon view")) {
+        if (BMenuItem* item = menu->FindItem(
+            B_TRANSLATE("Icon view"))) {
             sizeMenu = item->Submenu();
         }
 
@@ -3001 +3107 @@
         EnableNamedMenuItem(menu, kEmptyTrash, count > 0);
         EnableNamedMenuItem(menu, B_SELECT_ALL, count > 0);
 
-        BMenuItem *item = menu->FindItem(kTemplatesMenuName);
+        BMenuItem* item = menu->FindItem(
+            B_TRANSLATE("New"));
         if (item) {
-            TemplatesMenu *templateMenu = dynamic_cast<TemplatesMenu *>(
+            TemplatesMenu* templateMenu = dynamic_cast<TemplatesMenu *>(
                 item->Submenu());
             if (templateMenu)
                 templateMenu->UpdateMenuState();
@@ -3022 +3129 @@
     entry_ref addonRef;
     status_t result = message->FindRef("refs", &addonRef);
     if (result != B_OK) {
-        char buffer[1024];
-        sprintf(buffer, "Error %s loading add-On %s.", strerror(result), addonRef.name);
-        BAlert* alert = new BAlert("", buffer, "Cancel", 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BString buffer(B_TRANSLATE("Error %error loading add-On %name."));
+    buffer.ReplaceFirst("%error", strerror(result));
+    buffer.ReplaceFirst("%name", addonRef.name);
+
+        BAlert* alert = new BAlert("",
+            buffer.String(),
+            B_TRANSLATE("Cancel"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return;
@@ -3086 +3197 @@
     ASSERT(PoseView());
 
     BMenuItem *item;
-    menu->AddItem(item = new BMenuItem("Copy layout", new BMessage(kCopyAttributes)));
+    menu->AddItem(item = new BMenuItem(
+        B_TRANSLATE("Copy layout"),
+        new BMessage(kCopyAttributes)));
     item->SetTarget(PoseView());
-    menu->AddItem(item = new BMenuItem("Paste layout", new BMessage(kPasteAttributes)));
+    menu->AddItem(item = new BMenuItem(
+        B_TRANSLATE("Paste layout"),
+        new BMessage(kPasteAttributes)));
     item->SetTarget(PoseView());
     menu->AddSeparatorItem();
 
-    menu->AddItem(NewAttributeMenuItem ("Name", kAttrStatName, B_STRING_TYPE,
-        145, B_ALIGN_LEFT, true, true));
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Name"),
+        kAttrStatName, B_STRING_TYPE, 145, B_ALIGN_LEFT, true, true));
 
-    menu->AddItem(NewAttributeMenuItem ("Size", kAttrStatSize, B_OFF_T_TYPE,
+    menu->AddItem(NewAttributeMenuItem (B_TRANSLATE("Size"), kAttrStatSize, B_OFF_T_TYPE,
         80, B_ALIGN_RIGHT, false, true));
 
-    menu->AddItem(NewAttributeMenuItem ("Modified", kAttrStatModified, B_TIME_TYPE,
-        150, B_ALIGN_LEFT, false, true));
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Modified"),
+        kAttrStatModified, B_TIME_TYPE, 150, B_ALIGN_LEFT, false, true));
 
-    menu->AddItem(NewAttributeMenuItem ("Created", kAttrStatCreated, B_TIME_TYPE,
-        150, B_ALIGN_LEFT, false, true));
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Created"),
+        kAttrStatCreated, B_TIME_TYPE, 150, B_ALIGN_LEFT, false, true));
 
-    menu->AddItem(NewAttributeMenuItem ("Kind", kAttrMIMEType, B_MIME_STRING_TYPE,
-        145, B_ALIGN_LEFT, false, false));
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Kind"),
+        kAttrMIMEType, B_MIME_STRING_TYPE, 145, B_ALIGN_LEFT, false, false));
 
     if (IsTrash() || InTrash())
-        menu->AddItem(NewAttributeMenuItem ("Original name", kAttrOriginalPath, B_STRING_TYPE,
-            225, B_ALIGN_LEFT, false, false));
+        menu->AddItem(NewAttributeMenuItem(
+            B_TRANSLATE("Original name"),
+            kAttrOriginalPath, B_STRING_TYPE, 225, B_ALIGN_LEFT, false, false));
     else
-        menu->AddItem(NewAttributeMenuItem ("Location", kAttrPath, B_STRING_TYPE,
+        menu->AddItem(NewAttributeMenuItem(
+            B_TRANSLATE("Location"), kAttrPath, B_STRING_TYPE,
             225, B_ALIGN_LEFT, false, false));
 
 #ifdef OWNER_GROUP_ATTRIBUTES
-    menu->AddItem(NewAttributeMenuItem ("Owner", kAttrStatOwner, B_STRING_TYPE,
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Owner"), kAttrStatOwner, B_STRING_TYPE,
         60, B_ALIGN_LEFT, false, true));
 
-    menu->AddItem(NewAttributeMenuItem ("Group", kAttrStatGroup, B_STRING_TYPE,
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Group"), kAttrStatGroup, B_STRING_TYPE,
         60, B_ALIGN_LEFT, false, true));
 #endif
 
-    menu->AddItem(NewAttributeMenuItem ("Permissions", kAttrStatMode, B_STRING_TYPE,
-        80, B_ALIGN_LEFT, false, true));
+    menu->AddItem(NewAttributeMenuItem(
+        B_TRANSLATE("Permissions"),
+        kAttrStatMode, B_STRING_TYPE, 80, B_ALIGN_LEFT, false, true));
 }
 
 

WidgetAttributeText.cpp

@@ -40 +40 @@
 
 #include <Alert.h>
 #include <AppFileInfo.h>
+#include <Catalog.h>
 #include <Debug.h>
+#include <Locale.h>
 #include <NodeInfo.h>
 #include <Path.h>
 #include <TextView.h>
@@ -61 +63 @@
 #include "WidgetAttributeText.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
+
 const int32 kGenericReadBufferSize = 1024;
 
 template <class View>
@@ -215 +222 @@
         *result = "-";
         return view->StringWidth("-");
     } else if (value < kKBSize) {
-        sprintf(buffer, "%Ld bytes", value);
+        sprintf(buffer, B_TRANSLATE("%Ld bytes"), value);
         if (view->StringWidth(buffer) > width)
-            sprintf(buffer, "%Ld B", value);
+            sprintf(buffer, B_TRANSLATE("%Ld B"), value);
     } else {
         const char *suffix;
         float floatValue;
         if (value >= kTBSize) {
-            suffix = "TiB";
+            suffix = B_TRANSLATE("TiB");
             floatValue = (float)value / kTBSize;
         } else if (value >= kGBSize) {
-            suffix = "GiB";
+            suffix = B_TRANSLATE("GiB");
             floatValue = (float)value / kGBSize;
         } else if (value >= kMBSize) {
-            suffix = "MiB";
+            suffix = B_TRANSLATE("MiB");
             floatValue = (float)value / kMBSize;
         } else {
             ASSERT(value >= kKBSize);
-            suffix = "KiB";
+            suffix = B_TRANSLATE("KiB");
             floatValue = (float)value / kKBSize;
         }
 
@@ -751 +758 @@
 
     // get the mime type
     if (mime.SetType(fModel->MimeType()) != B_OK)
-        *result = "Unknown";
+        *result = B_TRANSLATE("Unknown");
     // get the short mime type description
     else if (mime.GetShortDescription(desc) == B_OK)
         *result = desc;
@@ -872 +879 @@
 
     bool removeExisting = false;
     if (parent.Contains(text)) {
-        BAlert *alert = new BAlert("", "That name is already taken. "
-                "Please type another one.", "Replace other file", "OK", NULL,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("That name is already taken. "
+            "Please type another one."),
+            B_TRANSLATE("Replace other file"),
+            B_TRANSLATE("OK"),
+            NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
 
         alert->SetShortcut(0, 'r');
 
@@ -1592 +1602 @@
         && type != B_DOUBLE_TYPE
         && type != B_CHAR_TYPE
         && type != B_BOOL_TYPE) {
-        BAlert *alert = new BAlert("", "Sorry, you cannot edit that attribute.",
-            "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("Sorry, you cannot edit that attribute."),
+            B_TRANSLATE("Cancel"),
+            0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
         return false;
@@ -1626 +1638 @@
                 sscanf(textView->Text(), "%c", &ch);
                 //Check if we read the start of a multi-byte glyph:
                 if (!isprint(ch)) {
-                    BAlert *alert = new BAlert("", "Sorry, the 'Character' "
-                        "attribute cannot store a multi-byte glyph.",
-                        "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                    BAlert* alert = new BAlert("",
+                        B_TRANSLATE("Sorry, the 'Character' "
+                        "attribute cannot store a multi-byte glyph."),
+                        B_TRANSLATE("Cancel"),
+                        0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
                     alert->SetShortcut(0, B_ESCAPE);
                     alert->Go();
                     return false;
@@ -1727 +1741 @@
     }
 
     if (size < 0) {
-        BAlert *alert = new BAlert("",
-            "There was an error writing the attribute.",
-            "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("There was an error writing the attribute."),
+            B_TRANSLATE("Cancel"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
         alert->SetShortcut(0, B_ESCAPE);
         alert->Go();
 

Tracker.cpp

@@ -40 +40 @@
 
 #include <Alert.h>
 #include <Autolock.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <FindDirectory.h>
 #include <fs_attr.h>
 #include <fs_info.h>
 #include <image.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <NodeInfo.h>
 #include <NodeMonitor.h>
@@ -206 +208 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 TTracker::TTracker()
     :   BApplication(kTrackerSignature),
     fSettingsWindow(NULL)
@@ -663 +668 @@
 
         if (!brokenLinkWithSpecificHandler) {
             delete model;
-            BAlert *alert = new BAlert("",
-                "There was an error resolving the link.",
-                "Cancel", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            BAlert* alert = new BAlert("",
+                B_TRANSLATE(
+                    "There was an error resolving the link."),
+                B_TRANSLATE(
+                    "Cancel"),
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             alert->SetShortcut(0, B_ESCAPE);
             alert->Go();
             return result;

libTracker.rdef

@@ +1 @@
+resource app_signature "application/x-vnd.Haiku-libTracker";

MountMenu.cpp

@@ -34 +34 @@
 
 // MountMenu implements a context menu used for mounting/unmounting volumes
 
+#include <Catalog.h>
 #include <Debug.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <Mime.h>
 #include <InterfaceDefs.h>
@@ -154 +156 @@
 //  #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 MountMenu::MountMenu(const char *name)
     : BMenu(name)
 {
@@ -214 +219 @@
 
     AddSeparatorItem();
 
-    BMenuItem *mountAll = new BMenuItem("Mount all",
+    BMenuItem* mountAll = new BMenuItem(
+        B_TRANSLATE("Mount all"),
         new BMessage(kMountAllNow));
     AddItem(mountAll);
-    BMenuItem *mountSettings = new BMenuItem("Settings" B_UTF8_ELLIPSIS,
+    BMenuItem* mountSettings = new BMenuItem(
+            B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
         new BMessage(kRunAutomounterSettings));
     AddItem(mountSettings);
 

QueryContainerWindow.cpp

@@ -32 +32 @@
 All rights reserved.
 */
 
+#include <Catalog.h>
+#include <Locale.h>
 #include <Menu.h>
 #include <MenuItem.h>
 #include <Path.h>
@@ -45 +47 @@
 #include "QueryPoseView.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BQueryContainerWindow::BQueryContainerWindow(LockingList<BWindow> *windowList,
     uint32 containerWindowFlags, window_look look,
     window_feel feel, uint32 flags, uint32 workspace)
@@ -85 +91 @@
 {
     BMenuItem *item;
 
-    item = new BMenuItem("Resize to fit", new BMessage(kResizeToFit), 'Y');
+    item = new BMenuItem(B_TRANSLATE("Resize to fit"),
+        new BMessage(kResizeToFit), 'Y');
     item->SetTarget(this);
     menu->AddItem(item);
 
-    item = new BMenuItem("Select"B_UTF8_ELLIPSIS, new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
+    item = new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
+        new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A');
+    item = new BMenuItem(B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Invert selection", new BMessage(kInvertSelection), 'S');
+    item = new BMenuItem(B_TRANSLATE("Invert selection"),
+        new BMessage(kInvertSelection), 'S');
     item->SetTarget(PoseView());
     menu->AddItem(item);
 
-    item = new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W');
+    item = new BMenuItem(B_TRANSLATE("Close"),
+        new BMessage(B_QUIT_REQUESTED), 'W');
     item->SetTarget(this);
     menu->AddItem(item);
 }
@@ -110 +122 @@
 void 
 BQueryContainerWindow::AddWindowContextMenus(BMenu *menu)
 {
-    BMenuItem *resizeItem = new BMenuItem("Resize to Fit",
+    BMenuItem* resizeItem = new BMenuItem(
+        B_TRANSLATE("Resize to Fit"),
         new BMessage(kResizeToFit), 'Y');
     menu->AddItem(resizeItem);
-    menu->AddItem(new BMenuItem("Select"B_UTF8_ELLIPSIS, new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
-    menu->AddItem(new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
-    BMenuItem *closeItem = new BMenuItem("Close",
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
+        new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("Select all"),
+        new BMessage(B_SELECT_ALL), 'A'));
+    BMenuItem* closeItem = new BMenuItem(
+        B_TRANSLATE("Close"),
         new BMessage(B_QUIT_REQUESTED), 'W');
     menu->AddItem(closeItem);
     // target items as needed

Model.cpp

@@ -46 +46 @@
 
 #include <AppDefs.h>
 #include <Bitmap.h>
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
+#include <Locale.h>
 #include <NodeInfo.h>
 #include <NodeMonitor.h>
 #include <Path.h>
@@ -83 +85 @@
 }
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 Model::Model()
     :
     fPreferredAppName(NULL),
@@ -328 +333 @@
 const char *
 Model::Name() const
 {
+    static const char* kRootNodeName = B_TRANSLATE_MARK("Disks");
+    static const char* kTrashNodeName = B_TRANSLATE_MARK("Trash");
+    static const char* kDesktopNodeName = B_TRANSLATE_MARK("Desktop");
+
     switch (fBaseType) {
         case kRootNode:
-            return "Disks";
+            return B_TRANSLATE(kRootNodeName);
             
         case kVolumeNode:
             if (fVolumeName)
                 return fVolumeName;
             break;
-                
         case kTrashNode:
-            return "Trash";
+            return B_TRANSLATE(kTrashNodeName);
         
         case kDesktopNode:
-            return "Desktop";
+            return B_TRANSLATE(kDesktopNodeName);
             
         default:
             break;

DirMenu.cpp

@@ -35 +35 @@
 // ToDo:
 // get rid of fMenuBar, SetMenuBar and related mess
 
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
+#include <Locale.h>
 #include <MenuBar.h>
 #include <Path.h>
 #include <Volume.h>
@@ -52 +54 @@
 #include "Utilities.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BDirMenu::BDirMenu(BMenuBar *bar, uint32 command, const char *entryName)
     :   BPopUpMenu("directories"),
         fMenuBar(bar),
@@ -83 +89 @@
         ThrowOnInitCheckError(&model);
     
         ModelMenuItem *menu = new ModelMenuItem(&model, this, true, true);
-    
+
         if (fMenuBar)
             fMenuBar->AddItem(menu);
     
@@ -143 +149 @@
                         AddDisksIconToMenu(reverse);
                     entry = desktopEntry;
                 }
-                
                 if (entry == desktopEntry)
                     hitRoot = true;
             }
-                
             if (result == kReadAttrFailed || !info.fInvisible
                 || (showDesktop && desktopEntry == entry)) 
                 AddItemToDirMenu(&entry, originatingWindow, reverse,
@@ -165 +169 @@
         // select last item in menu
         if (!select)
             return;
-            
         ModelMenuItem *item = dynamic_cast<ModelMenuItem *>(ItemAt(CountItems() - 1));
         if (item) {
             item->SetMarked(true);
@@ -249 +252 @@
     BMessage *message = new BMessage(fCommand);
     message->AddRef(fEntryName.String(), model.EntryRef());
 
-    ModelMenuItem *item = new ModelMenuItem(&model, "Disks", message);
+    ModelMenuItem* item = new ModelMenuItem(&model,
+        B_TRANSLATE("Disks"),
+        message);
     if (atEnd)
         AddItem(item);
     else

TrackerInitialState.cpp

@@ -37 +37 @@
 // important sniffer rules
 
 #include <Alert.h>
+#include <Catalog.h>
 #include <Directory.h>
 #include <InterfaceDefs.h>
+#include <Locale.h>
 #include <Message.h>
 #include <Node.h>
 #include <Path.h>
@@ -330 +332 @@
 // #pragma mark -
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 bool
 TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
     const char *shortDescription, const char *longDescription,
@@ -592 +597 @@
     BPath path;
     status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
     if (status < B_OK) {
-        BString errorMessage;
-        errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
-        errorMessage << "find_directory() failed. \nReason: ";
-        errorMessage << strerror(status);
-        (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+        BString errorMessage(B_TRANSLATE("At %func \nfind_directory() failed. \nReason: %error"));
+        errorMessage.ReplaceFirst("%func", __PRETTY_FUNCTION__);
+        errorMessage.ReplaceFirst("%error", strerror(status));
+        (new BAlert("AlertError", errorMessage.String(),
+            B_TRANSLATE("OK"),
+            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
         return;
     }
     path.Append("artwork");

SelectionWindow.cpp

@@ -35 +35 @@
 #include <BeBuild.h>
 #include <Alert.h>
 #include <Box.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <MenuItem.h>
 
 #include "AutoLock.h"
@@ -47 +49 @@
 
 const uint32 kSelectButtonPressed = 'sbpr';
 
-SelectionWindow::SelectionWindow(BContainerWindow *window)
-    : BWindow(BRect(0, 0, 270, 0), "Select", B_TITLED_WINDOW,
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
+SelectionWindow::SelectionWindow(BContainerWindow* window)
+    : BWindow(BRect(0, 0, 270, 0),
+        B_TRANSLATE("Select"),
+        B_TITLED_WINDOW,
         B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_V_RESIZABLE
         | B_NO_WORKSPACE_ACTIVATION | B_ASYNCHRONOUS_CONTROLS
         | B_NOT_ANCHORED_ON_ACTIVATE),
@@ -67 +74 @@
     AddChild(backgroundView);
 
     BMenu *menu = new BPopUpMenu("");
-    menu->AddItem(new BMenuItem("starts with", NULL));
-    menu->AddItem(new BMenuItem("ends with", NULL));
-    menu->AddItem(new BMenuItem("contains", NULL));
-    menu->AddItem(new BMenuItem("matches wildcard expression", NULL));
-    menu->AddItem(new BMenuItem("matches regular expression", NULL));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("starts with"),
+        NULL));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("ends with"),
+        NULL));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("contains"),
+        NULL));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("matches wildcard expression"),
+        NULL));
+    menu->AddItem(new BMenuItem(
+        B_TRANSLATE("matches regular expression"),
+        NULL));
 
     menu->SetLabelFromMarked(true);
     menu->ItemAt(3)->SetMarked(true);
@@ -79 +96 @@
 
     // Set up the menu field
     fMatchingTypeMenuField = new BMenuField(BRect(7, 6, Bounds().right - 5, 0),
-        NULL, "Name", menu);
+        NULL, B_TRANSLATE("Name"), menu);
     backgroundView->AddChild(fMatchingTypeMenuField);
-    fMatchingTypeMenuField->SetDivider(fMatchingTypeMenuField->StringWidth("Name") + 8);
+    fMatchingTypeMenuField->SetDivider(fMatchingTypeMenuField->StringWidth(
+        B_TRANSLATE("Name")) + 8);
     fMatchingTypeMenuField->ResizeToPreferred();
 
     // Set up the expression text control
@@ -93 +111 @@
     fExpressionTextControl->MakeFocus(true);
 
     // Set up the Invert checkbox
-    fInverseCheckBox = new BCheckBox(BRect(7, fExpressionTextControl->Frame().bottom
-        + 6, 6, 6), NULL, "Invert", NULL);
+    fInverseCheckBox = new BCheckBox(
+        BRect(7, fExpressionTextControl->Frame().bottom + 6, 6, 6),
+        NULL,
+        B_TRANSLATE("Invert"),
+        NULL);
     backgroundView->AddChild(fInverseCheckBox);
     fInverseCheckBox->ResizeToPreferred();
 
     // Set up the Ignore Case checkbox
-    fIgnoreCaseCheckBox = new BCheckBox(BRect(fInverseCheckBox->Frame().right + 10,
-        fInverseCheckBox->Frame().top, 6, 6), NULL, "Ignore case", NULL);
+    fIgnoreCaseCheckBox = new BCheckBox(
+        BRect(fInverseCheckBox->Frame().right + 10,
+        fInverseCheckBox->Frame().top,
+        6, 6),
+        NULL,
+        B_TRANSLATE("Ignore case"),
+        NULL);
     fIgnoreCaseCheckBox->SetValue(1);
     backgroundView->AddChild(fIgnoreCaseCheckBox);
     fIgnoreCaseCheckBox->ResizeToPreferred();
 
     // Set up the Select button
-    fSelectButton = new BButton(BRect(0, 0, 5, 5), NULL, "Select",
+    fSelectButton = new BButton(
+        BRect(0, 0, 5, 5),
+        NULL,
+        B_TRANSLATE("Select"),
         new BMessage(kSelectButtonPressed), B_FOLLOW_RIGHT);
 
     backgroundView->AddChild(fSelectButton);
@@ -125 +154 @@
     float topMiddleButton =
         (fSelectButton->Bounds().Height() / 2 -
         (fh.ascent + fh.descent + fh.leading + 4) / 2) + fSelectButton->Frame().top;
-    fInverseCheckBox->MoveTo(fInverseCheckBox->Frame().left, topMiddleButton);
-    fIgnoreCaseCheckBox->MoveTo(fIgnoreCaseCheckBox->Frame().left, topMiddleButton);
+    fInverseCheckBox->MoveTo(fInverseCheckBox->Frame().left,
+        topMiddleButton);
+    fIgnoreCaseCheckBox->MoveTo(fIgnoreCaseCheckBox->Frame().left,
+        topMiddleButton);
 
     float bottomMinWidth = 32 + fSelectButton->Bounds().Width() +
         fInverseCheckBox->Bounds().Width() + fIgnoreCaseCheckBox->Bounds().Width();
-    float topMinWidth = be_plain_font->StringWidth("Name matches wildcard expression:###");
+    float topMinWidth = be_plain_font->StringWidth(B_TRANSLATE("Name matches wildcard expression:###"));
     float minWidth = bottomMinWidth > topMinWidth ? bottomMinWidth : topMinWidth;
 
     Run();

FindPanel.cpp

@@ -35 +35 @@
 #include <Application.h>
 #include <Box.h>
 #include <Button.h>
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <FindDirectory.h>
 #include <File.h>
 #include <FilePanel.h>
+#include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
@@ -73 +75 @@
 #include "Tracker.h"
 #include "Utilities.h"
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 const char *kAllMimeTypes = "mime/ALLTYPES";
 
 const BRect kInitialRect(100, 100, 530, 210);
@@ -85 +91 @@
 const uint32 kSwitchToQueryTemplate = 'swqt';
 const uint32 kRunSaveAsTemplatePanel = 'svtm';
 
-const char *kDragNDropTypes [] = { B_QUERY_MIMETYPE, B_QUERY_TEMPLATE_MIMETYPE };
-const char *kDragNDropActionSpecifiers [] = { "Create a Query", "Create a Query template" };
+const char* kDragNDropTypes [] = {
+    B_QUERY_MIMETYPE,
+    B_QUERY_TEMPLATE_MIMETYPE };
+static const char *kDragNDropActionSpecifiers [] = {
+    B_TRANSLATE_MARK("Create a Query"),
+    B_TRANSLATE_MARK("Create a Query template") };
 
 const uint32 kAttachFile = 'attf';
 
@@ -125 +135 @@
 
 
 void
-MoreOptionsStruct::EndianSwap(void *)
+MoreOptionsStruct::EndianSwap(void*)
 {
     // noop for now
 }
@@ -162 +172 @@
 //  #pragma mark -
 
 
-FindWindow::FindWindow(const entry_ref *newRef, bool editIfTemplateOnly)
-    :   BWindow(kInitialRect, "Find", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
+FindWindow::FindWindow(const entry_ref* newRef, bool editIfTemplateOnly)
+    :   BWindow(kInitialRect,
+        B_TRANSLATE("Find"),
+        B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
         fFile(TryOpening(newRef)),
         fFromTemplate(false),
         fEditTemplateOnly(false),
@@ -176 +188 @@
             if (BNodeInfo(fFile).GetType(type) == B_OK
                 && strcasecmp(type, B_QUERY_TEMPLATE_MIMETYPE) == 0) {
                 fEditTemplateOnly = true;
-                SetTitle("Edit Query template");
+                SetTitle(B_TRANSLATE("Edit Query template"));
             }
         }
     } else {
@@ -205 +217 @@
 
     fFromTemplate = IsQueryTemplate(fFile);
 
-    fBackground = new FindPanel(Bounds(), fFile, this, fFromTemplate, fEditTemplateOnly);
+    fBackground = new FindPanel(Bounds(),
+        fFile, this, fFromTemplate, fEditTemplateOnly);
     AddChild(fBackground);
 }
 
@@ -362 +375 @@
 
     // save date/time info for recent query support and transient query killer
     int32 currentTime = (int32)time(0);
-    file->WriteAttr(kAttrQueryLastChange, B_INT32_TYPE, 0, &currentTime, sizeof(int32));
+    file->WriteAttr(kAttrQueryLastChange,
+        B_INT32_TYPE, 0, &currentTime, sizeof(int32));
     int32 tmp = 1;
     file->WriteAttr("_trk/recentQuery", B_INT32_TYPE, 0, &tmp, sizeof(int32));
 }
@@ -380 +394 @@
         // and the file's location
         FSSetPoseLocation(entry, *oldLocation);
 
-    BNodeInfo(file).SetType(queryTemplate ? B_QUERY_TEMPLATE_MIMETYPE : B_QUERY_MIMETYPE);
+    BNodeInfo(file).SetType(
+        queryTemplate
+        ? B_QUERY_TEMPLATE_MIMETYPE
+        : B_QUERY_MIMETYPE);
 
     BString predicate;
     bool dynamicDate;
@@ -434 +451 @@
         // write out all the dialog items as attributes so that the query can
         // be reopened and edited later
 
-    BView *focusedItem = CurrentFocus();
+    BView* focusedItem = CurrentFocus();
     if (focusedItem) {
         // text controls never get the focus, their internal text views do
-        BView *parent = focusedItem->Parent();
+        BView* parent = focusedItem->Parent();
         if (dynamic_cast<BTextControl *>(parent))
             focusedItem = parent;
 
         // write out the current focus and, if text control, selection
         BString name(focusedItem->Name());
         file->WriteAttrString("_trk/focusedView", &name);
-        BTextControl *textControl = dynamic_cast<BTextControl *>(focusedItem);
+        BTextControl* textControl = dynamic_cast<BTextControl *>(focusedItem);
         if (textControl) {
             int32 selStart, selEnd;
             textControl->TextView()->GetSelection(&selStart, &selEnd);
@@ -474 +491 @@
     if (!FindSaveCommon(true)) {
         // have to wait for the node monitor to force old query to close
         // to avoid a race condition
-        TTracker *tracker = dynamic_cast<TTracker *>(be_app);
+        TTracker* tracker = dynamic_cast<TTracker *>(be_app);
         ASSERT(tracker);
         for (int32 timeOut = 0; ; timeOut++) {
             if (!tracker->EntryHasWindowOpen(&fRef))
@@ -494 +511 @@
     }
 
     int32 currentTime = (int32)time(0);
-    fFile->WriteAttr(kAttrQueryLastChange, B_INT32_TYPE, 0, &currentTime, sizeof(int32));
+    fFile->WriteAttr(kAttrQueryLastChange,
+        B_INT32_TYPE, 0, &currentTime, sizeof(int32));
 
     // tell the tracker about it
     BMessage message(B_REFS_RECEIVED);
@@ -625 +643 @@
             else {
                 BMessenger panel(BackgroundView());
                 fSaveAsTemplatePanel = new BFilePanel(B_SAVE_PANEL, &panel);
-                fSaveAsTemplatePanel->SetSaveText("Query template");
-                fSaveAsTemplatePanel->Window()->SetTitle("Save as Query template:");
+                fSaveAsTemplatePanel->SetSaveText(
+                    B_TRANSLATE("Query template"));
+                fSaveAsTemplatePanel->Window()->SetTitle(
+                    B_TRANSLATE("Save as Query template:"));
                 fSaveAsTemplatePanel->Show();
             }
             break;
@@ -666 +686 @@
 
     BMessenger self(this);
     fRecentQueries = new BPopUpMenu("RecentQueries");
-    FindPanel::AddRecentQueries(fRecentQueries, true, &self, kSwitchToQueryTemplate);
+    FindPanel::AddRecentQueries(fRecentQueries,
+        true, &self, kSwitchToQueryTemplate);
 
     AddChild(new MiniMenuField(rect, "RecentQueries", fRecentQueries));
 
@@ -680 +701 @@
     rect.right = rect.left + 150;
     fMimeTypeField = new BMenuField(rect, "MimeTypeMenu", "", fMimeTypeMenu);
     fMimeTypeField->SetDivider(0.0f);
-    fMimeTypeField->MenuItem()->SetLabel("All files and folders");
+    fMimeTypeField->MenuItem()->SetLabel(
+        B_TRANSLATE("All files and folders"));
     AddChild(fMimeTypeField);
 
     // add popup for search criteria
     fSearchModeMenu = new BPopUpMenu("searchMode");
-    fSearchModeMenu->AddItem(new BMenuItem("by name", new BMessage(kByNameItem)));
-    fSearchModeMenu->AddItem(new BMenuItem("by attribute", new BMessage(kByAttributeItem)));
-    fSearchModeMenu->AddItem(new BMenuItem("by formula", new BMessage(kByFormulaItem)));
+    fSearchModeMenu->AddItem(
+        new BMenuItem(B_TRANSLATE("by name"),
+        new BMessage(kByNameItem)));
+    fSearchModeMenu->AddItem(
+        new BMenuItem(B_TRANSLATE("by attribute"),
+        new BMessage(kByAttributeItem)));
+    fSearchModeMenu->AddItem(
+        new BMenuItem(B_TRANSLATE("by formula"),
+        new BMessage(kByFormulaItem)));
 
     fSearchModeMenu->ItemAt(initialMode == kByNameItem ? 0 :
         (initialMode == kByAttributeItem ? 1 : 2))->SetMarked(true);
@@ -695 +723 @@
     rect.left = rect.right + 10;
     rect.right = rect.left + 100;
     rect.bottom = rect.top + 15;
-    BMenuField *menuField = new BMenuField(rect, "", "", fSearchModeMenu);
+    BMenuField* menuField = new BMenuField(rect, "", "", fSearchModeMenu);
     menuField->SetDivider(0.0f);
     AddChild(menuField);
 
@@ -703 +731 @@
     rect.right = bounds.right - 15;
     rect.left = rect.right - 100;
     fVolMenu = new BPopUpMenu("", false, false);    // don't radioMode
-    menuField = new BMenuField(rect, "", "On", fVolMenu);
+    menuField = new BMenuField(rect, "",
+        B_TRANSLATE("On"),
+        fVolMenu);
     menuField->SetDivider(menuField->StringWidth(menuField->Label()) + 8);
     AddChild(menuField);
     AddVolumes(fVolMenu);
@@ -715 +745 @@
         dragNDropMessage.AddString("be:types", B_FILE_MIME_TYPE);
         dragNDropMessage.AddString("be:filetypes", kDragNDropTypes[0]);
         dragNDropMessage.AddString("be:filetypes", kDragNDropTypes[1]);
-        dragNDropMessage.AddString("be:actionspecifier", kDragNDropActionSpecifiers[0]);
-        dragNDropMessage.AddString("be:actionspecifier", kDragNDropActionSpecifiers[1]);
+        dragNDropMessage.AddString("be:actionspecifier",
+            B_TRANSLATE(kDragNDropActionSpecifiers[0]));
+        dragNDropMessage.AddString("be:actionspecifier",
+            B_TRANSLATE(kDragNDropActionSpecifiers[1]));
 
         BMessenger self(this);
-        fDraggableIcon = new DraggableQueryIcon(DraggableIcon::PreferredRect(draggableIconOrigin,
+        fDraggableIcon = new DraggableQueryIcon(
+            DraggableIcon::PreferredRect(draggableIconOrigin,
             B_LARGE_ICON), "saveHere", &dragNDropMessage,
             self, B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
         AddChild(fDraggableIcon);
@@ -747 +780 @@
     rect = expandedBounds;
     rect.right = rect.left + 200;
     rect.bottom = rect.top + 20;;
-    fQueryName = new BTextControl(rect, "queryName", "Query name:", "", 0);
+    fQueryName = new BTextControl(rect, "queryName",
+        B_TRANSLATE("Query name:"),
+        "", 0);
     fQueryName->SetDivider(fQueryName->StringWidth(fQueryName->Label()) + 5);
     fMoreOptionsPane->AddItem(fQueryName, 1);
     FillCurrentQueryName(fQueryName, parent);
@@ -755 +790 @@
     rect.top = rect.bottom + 6;
     rect.bottom = rect.top + 16;
     rect.right = rect.left + 100;
-    fSearchTrashCheck = new BCheckBox(rect, "searchTrash", "Include trash", 0);
+    fSearchTrashCheck = new BCheckBox(rect, "searchTrash",
+        B_TRANSLATE("Include trash"),
+        0);
     fSearchTrashCheck->ResizeToPreferred();
     fMoreOptionsPane->AddItem(fSearchTrashCheck, 1);
 
     rect.OffsetBy(fSearchTrashCheck->Bounds().Width() + 8, 0);
-    fTemporaryCheck = new BCheckBox(rect, "temporary", "Temporary", 0);
+    fTemporaryCheck = new BCheckBox(rect, "temporary",
+        B_TRANSLATE("Temporary"),
+        0);
     fMoreOptionsPane->AddItem(fTemporaryCheck, 1);
     fTemporaryCheck->SetValue(1);
 
@@ -787 +826 @@
     rect.top = rect.bottom - 30;
     rect.right = rect.left + 60;
     rect.bottom = rect.top + 20;
-    BButton *button;
+    BButton* button;
     if (editTemplateOnly)
-        button = new BButton(rect, "save", "Save",
+        button = new BButton(rect, "save",
+            B_TRANSLATE("Save"),
             new BMessage(kSaveButton), B_FOLLOW_RIGHT + B_FOLLOW_BOTTOM);
     else
-        button = new BButton(rect, "find", "Search",
+        button = new BButton(rect, "find",
+            B_TRANSLATE("Search"),
             new BMessage(kFindButton), B_FOLLOW_RIGHT + B_FOLLOW_BOTTOM);
 
     AddChild(button);
@@ -831 +872 @@
             textControl->MakeFocus();
     }
 
-    BButton *button = dynamic_cast<BButton *>(FindView("remove"));
+    BButton* button = dynamic_cast<BButton *>(FindView("remove"));
     if (button)
         button->SetTarget(this);
 
@@ -956 +997 @@
     } else if (countSelected > 1)
         // if more than two disks selected, don't use the disk name
         // as a label
-        PopUpMenuSetTitle(fVolMenu, "multiple disks");
+        PopUpMenuSetTitle(fVolMenu,
+            B_TRANSLATE("multiple disks"));
     else {
         ASSERT(tmpItem);
         PopUpMenuSetTitle(fVolMenu, tmpItem->Label());
@@ -1053 +1095 @@
                 Window()->ResizeTo(Window()->Frame().Width(),
                     ViewHeightForMode(kByAttributeItem, fLatch->Value() != 0));
 
-                BBox *box = dynamic_cast<BBox *>(FindView("Box"));
+                BBox* box = dynamic_cast<BBox *>(FindView("Box"));
                 ASSERT(box);
                 box->ResizeTo(box->Bounds().Width(),
                     BoxHeightForMode(kByAttributeItem, fLatch->Value() != 0));
@@ -1109 +1151 @@
                     bool queryTemplate = false;
 
                     if (actionSpecifier
-                        && strcasecmp(actionSpecifier, kDragNDropActionSpecifiers[0]) == 0)
+                        && strcasecmp(actionSpecifier,
+                            B_TRANSLATE(kDragNDropActionSpecifiers[0])) == 0)
                         query = true;
                     else if (actionSpecifier
-                        && strcasecmp(actionSpecifier, kDragNDropActionSpecifiers[1]) == 0)
+                        && strcasecmp(actionSpecifier,
+                            B_TRANSLATE(kDragNDropActionSpecifiers[1])) == 0)
                         queryTemplate = true;
                     else if (mimeType && strcasecmp(mimeType, kDragNDropTypes[0]) == 0)
                         query = true;
@@ -1137 +1181 @@
 {
     BDirectory directory(dir);
     BFile file(&directory, name, O_RDWR | O_CREAT | O_TRUNC);
-    BNodeInfo(&file).SetType(queryTemplate ? B_QUERY_TEMPLATE_MIMETYPE : B_QUERY_MIMETYPE);
+    BNodeInfo(&file).SetType(queryTemplate
+        ? B_QUERY_TEMPLATE_MIMETYPE
+        : B_QUERY_MIMETYPE);
 
     BMessage attach(kAttachFile);
     attach.AddRef("directory", dir);
@@ -1320 +1366 @@
     BTextControl *textControl = dynamic_cast<BTextControl *>(FindView("TextControl"));
     switch (Mode()) {
         case kByNameItem:
-            result << "Name = " << textControl->TextView()->Text();
-            break;
+            result.SetTo(B_TRANSLATE_COMMENT("Name = %name", "FindResultTitle"));
+            result.ReplaceFirst("%name", textControl->TextView()->Text());
+                        break;
 
         case kByFormulaItem:
-            result << "Formula " << textControl->TextView()->Text();
+            result.SetTo(B_TRANSLATE_COMMENT("Formula %formula", "FindResultTitle"));
+            result.ReplaceFirst("%formula", textControl->TextView()->Text());
             break;
 
         case kByAttributeItem:
@@ -1593 +1641 @@
 {
     BMessage *itemMessage = new BMessage(kMIMETypeItem);
     itemMessage->AddString("mimetype", kAllMimeTypes);
-    MimeTypeMenu()->AddItem(new BMenuItem("All files and folders", itemMessage));
+    MimeTypeMenu()->AddItem(
+        new BMenuItem(B_TRANSLATE("All files and folders"),
+        itemMessage));
     MimeTypeMenu()->AddSeparatorItem();
     MimeTypeMenu()->ItemAt(0)->SetMarked(true);
 
@@ -1673 +1723 @@
 
     BMessage *message = new BMessage(kVolumeItem);
     message->AddInt32("device", -1);
-    menu->AddItem(new BMenuItem("All disks", message));
+    menu->AddItem(
+        new BMenuItem(B_TRANSLATE("All disks"),
+        message));
     menu->AddSeparatorItem();
-    PopUpMenuSetTitle(menu, "All disks");
+    PopUpMenuSetTitle(menu, B_TRANSLATE("All disks"));
 
     BVolumeRoster roster;
     BVolume volume;
@@ -1813 +1865 @@
             menu->AddSeparatorItem();
 
         BMessage *message = new BMessage(kRunSaveAsTemplatePanel);
-        BMenuItem *item = new BMenuItem("Save Query as template"B_UTF8_ELLIPSIS, message);
+        BMenuItem* item =
+            new BMenuItem(
+            B_TRANSLATE("Save Query as template"B_UTF8_ELLIPSIS),
+            message);
         menu->AddItem(item);
     }
 }
@@ -1840 +1895 @@
         BRect rect = box->Bounds();
         rect.InsetBy(5, 10);
         rect.top = rect.bottom - 20;
-        rect.right = rect.left + 22 + be_plain_font->StringWidth("Add");
+        rect.right = rect.left + 22
+            + be_plain_font->StringWidth(B_TRANSLATE("Add"));
 
-        button = new BButton(rect, "add", "Add", new BMessage(kAddItem),
+        button = new BButton(rect, "add",
+            B_TRANSLATE("Add"),
+            new BMessage(kAddItem),
             B_FOLLOW_RIGHT + B_FOLLOW_BOTTOM);
         button->SetTarget(this);
         box->AddChild(button);
 
         rect.OffsetBy(rect.Width() + 6, 0);
-        rect.right = rect.left + 22 + be_plain_font->StringWidth("Remove");
-        button = new BButton(rect, "remove", "Remove", new BMessage(kRemoveItem),
+        rect.right = rect.left + 22
+            + be_plain_font->StringWidth(B_TRANSLATE("Remove"));
+        button = new BButton(rect, "remove",
+            B_TRANSLATE("Remove"),
+            new BMessage(kRemoveItem),
             B_FOLLOW_RIGHT + B_FOLLOW_BOTTOM);
 
         button->SetEnabled(false);
@@ -2333 +2394 @@
     BPopUpMenu *menu = new BPopUpMenu("PopUp");
 
     // add NAME attribute to popup
-    BMenu *submenu = new BMenu("Name");
+    BMenu* submenu = new BMenu(B_TRANSLATE("Name"));
     submenu->SetRadioMode(true);
     submenu->SetFont(be_plain_font);
     BMessage *message = new BMessage(kAttributeItemMain);
@@ -2342 +2403 @@
     BMenuItem *item = new BMenuItem(submenu, message);
     menu->AddItem(item);
 
-    const int32 operators[] = {B_CONTAINS, B_EQ, B_NE, B_BEGINS_WITH, B_ENDS_WITH};
-    const char *operatorLabels[] = {"contains", "is", "is not", "starts with", "ends with"};
+    const int32 operators[] = {
+        B_CONTAINS,
+        B_EQ,
+        B_NE,
+        B_BEGINS_WITH,
+        B_ENDS_WITH};
+    static const char *operatorLabels[] = {
+        B_TRANSLATE_MARK("contains"),
+        B_TRANSLATE_MARK("is"),
+        B_TRANSLATE_MARK("is not"),
+        B_TRANSLATE_MARK("starts with"),
+        B_TRANSLATE_MARK("ends with")};
 
-    for (int32 i = 0;i < 5;i++) {
+    for (int32 i = 0; i < 5; i++) {
         message = new BMessage(kAttributeItem);
         message->AddInt32("operator", operators[i]);
-        submenu->AddItem(new BMenuItem(operatorLabels[i], message));
+        submenu->AddItem(new BMenuItem(
+            B_TRANSLATE(operatorLabels[i]),
+            message));
     }
 
     // mark first item
@@ -2356 +2429 @@
     submenu->ItemAt(0)->SetMarked(true);
 
     // add SIZE attribute
-    submenu = new BMenu("Size");
+    submenu = new BMenu(B_TRANSLATE("Size"));
     submenu->SetRadioMode(true);
     submenu->SetFont(be_plain_font);
     message = new BMessage(kAttributeItemMain);
@@ -2367 +2440 @@
 
     message = new BMessage(kAttributeItem);
     message->AddInt32("operator", B_GE);
-    submenu->AddItem(new BMenuItem("greater than", message));
+    submenu->AddItem(new BMenuItem(
+        B_TRANSLATE("greater than"), message));
 
     message = new BMessage(kAttributeItem);
     message->AddInt32("operator", B_LE);
-    submenu->AddItem(new BMenuItem("less than", message));
+    submenu->AddItem(new BMenuItem(
+        B_TRANSLATE("less than"), message));
 
     message = new BMessage(kAttributeItem);
     message->AddInt32("operator", B_EQ);
-    submenu->AddItem(new BMenuItem("is", message));
+    submenu->AddItem(new BMenuItem(
+        B_TRANSLATE("is"), message));
 
     // add "modified" field
-    submenu = new BMenu("Modified");
+    submenu = new BMenu(
+        B_TRANSLATE("Modified"));
     submenu->SetRadioMode(true);
     submenu->SetFont(be_plain_font);
     message = new BMessage(kAttributeItemMain);
@@ -2389 +2466 @@
 
     message = new BMessage(kAttributeItem);
     message->AddInt32("operator", B_LE);
-    submenu->AddItem(new BMenuItem("before", message));
+    submenu->AddItem(new BMenuItem(
+        B_TRANSLATE("before"), message));
 
     message = new BMessage(kAttributeItem);
     message->AddInt32("operator", B_GE);
-    submenu->AddItem(new BMenuItem("after", message));
+    submenu->AddItem(new BMenuItem(
+        B_TRANSLATE("after"), message));
 
     BRect bounds(Bounds());
     bounds.right = bounds.left + 100;
@@ -2518 +2597 @@
     BPopUpMenu *menu = new BPopUpMenu("");
     BMessage *message = new BMessage();
     message->AddInt32("combine", B_AND);
-    BMenuItem *item = new BMenuItem("And", message);
+    BMenuItem* item = new BMenuItem(
+        B_TRANSLATE("And"), message);
     menu->AddItem(item);
     if (selectAnd)
         item->SetMarked(true);
 
     message = new BMessage();
     message->AddInt32("combine", B_OR);
-    item = new BMenuItem("Or", message);
+    item = new BMenuItem(
+        B_TRANSLATE("Or"), message);
     menu->AddItem(item);
     if (!selectAnd)
         item->SetMarked(true);
@@ -2654 +2735 @@
             case B_STRING_TYPE:
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_CONTAINS);
-                submenu->AddItem(new BMenuItem("contains", message));
+                submenu->AddItem(new BMenuItem(
+                    B_TRANSLATE("contains"),
+                    message));
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_EQ);
-                submenu->AddItem(new BMenuItem("is", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("is"),
+                    message));
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_NE);
-                submenu->AddItem(new BMenuItem("is not", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("is not"),
+                    message));
                 submenu->SetTargetForItems(this);
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_BEGINS_WITH);
-                submenu->AddItem(new BMenuItem("starts with", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("starts with"),
+                    message));
                 submenu->SetTargetForItems(this);
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_ENDS_WITH);
-                submenu->AddItem(new BMenuItem("ends with", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("ends with"),
+                    message));
                 break;
 
             case B_BOOL_TYPE:
@@ -2689 +2780 @@
             case B_DOUBLE_TYPE:
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_EQ);
-                submenu->AddItem(new BMenuItem("is", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("is"),
+                    message));
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_GE);
-                submenu->AddItem(new BMenuItem("greater than", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("greater than"),
+                    message));
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_LE);
-                submenu->AddItem(new BMenuItem("less than", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("less than"),
+                    message));
                 break;
 
             case B_TIME_TYPE:
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_LE);
-                submenu->AddItem(new BMenuItem("before", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("before"),
+                    message));
 
                 message = new BMessage(kAttributeItem);
                 message->AddInt32("operator", B_GE);
-                submenu->AddItem(new BMenuItem("after", message));
+                submenu->AddItem(
+                    new BMenuItem(B_TRANSLATE("after"),
+                    message));
                 break;
         }
         submenu->SetTargetForItems(this);
@@ -2990 +3091 @@
     ASSERT(window);
     dragMessage->AddString("be:clip_name",
         window->BackgroundView()->UserSpecifiedName() ?
-            window->BackgroundView()->UserSpecifiedName() : "New Query");
+            window->BackgroundView()->UserSpecifiedName()
+            : B_TRANSLATE("New Query"));
 
     return true;
 }

FilePermissionsView.cpp

@@ -38 +38 @@
 #include <stdlib.h>
 
 #include <Beep.h>
+#include <Catalog.h>
+#include <Locale.h>
 
 
 const uint32 kPermissionsChanged = 'prch';
@@ -45 +47 @@
 const uint32 kNewGroupEntered = 'nwgr';
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 FilePermissionsView::FilePermissionsView(BRect rect, Model *model)
     :   BView(rect, "FilePermissionsView", B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW),
         fModel(model)
@@ -63 +68 @@
     strView->SetFontSize(kAttribFontHeight);
 
     strView = new BStringView(BRect(kColumnLabelMiddle - kColumnLabelWidth / 2
-        + kColumnLabelSpacing, kColumnLabelTop, kColumnLabelMiddle + kColumnLabelWidth / 2
-        + kColumnLabelSpacing, kColumnLabelBottom), "", "Group");
+        + kColumnLabelSpacing,
+        kColumnLabelTop,
+        kColumnLabelMiddle + kColumnLabelWidth / 2
+        + kColumnLabelSpacing,
+        kColumnLabelBottom),
+        "", B_TRANSLATE("Group"));
     AddChild(strView);
     strView->SetAlignment(B_ALIGN_CENTER);
     strView->SetFontSize(kAttribFontHeight);
 
     strView = new BStringView(BRect(kColumnLabelMiddle - kColumnLabelWidth / 2
-        + 2 * kColumnLabelSpacing, kColumnLabelTop, kColumnLabelMiddle + kColumnLabelWidth / 2
-        + 2 * kColumnLabelSpacing, kColumnLabelBottom), "", "Other");
+        + 2 * kColumnLabelSpacing,
+        kColumnLabelTop,
+        kColumnLabelMiddle + kColumnLabelWidth / 2
+        + 2 * kColumnLabelSpacing,
+        kColumnLabelBottom),
+        "", B_TRANSLATE("Other"));
     AddChild(strView);
     strView->SetAlignment(B_ALIGN_CENTER);
     strView->SetFontSize(kAttribFontHeight);
@@ -82 +95 @@
         - kColumnLabelWidth / 2 - 5, kRowLabelHeight = 14;
 
     strView = new BStringView(BRect(kRowLabelLeft, kRowLabelTop, kRowLabelRight,
-        kRowLabelTop + kRowLabelHeight), "", "Read");
+        kRowLabelTop + kRowLabelHeight),
+        "", B_TRANSLATE("Read"));
     AddChild(strView);
     strView->SetAlignment(B_ALIGN_RIGHT);
     strView->SetFontSize(kAttribFontHeight);
 
     strView = new BStringView(BRect(kRowLabelLeft, kRowLabelTop
         + kRowLabelVerticalSpacing, kRowLabelRight, kRowLabelTop
-        + kRowLabelVerticalSpacing + kRowLabelHeight), "", "Write");
+        + kRowLabelVerticalSpacing + kRowLabelHeight),
+        "", B_TRANSLATE("Write"));
     AddChild(strView);
     strView->SetAlignment(B_ALIGN_RIGHT);
     strView->SetFontSize(kAttribFontHeight);
 
     strView = new BStringView(BRect(kRowLabelLeft, kRowLabelTop
         + 2 * kRowLabelVerticalSpacing, kRowLabelRight, kRowLabelTop
-        + 2 * kRowLabelVerticalSpacing + kRowLabelHeight), "", "Execute");
+        + 2 * kRowLabelVerticalSpacing + kRowLabelHeight),
+        "", B_TRANSLATE("Execute"));
     AddChild(strView);
     strView->SetAlignment(B_ALIGN_RIGHT);
     strView->SetFontSize(kAttribFontHeight);
@@ -126 +142 @@
     const float kTextControlLeft = 170, kTextControlRight = 270,
         kTextControlTop = kColumnLabelTop, kTextControlHeight = 14, kTextControlSpacing = 16;
 
-    strView = new BStringView(BRect(kTextControlLeft, kTextControlTop, kTextControlRight,
-        kTextControlTop + kTextControlHeight), "", "Owner");
+    strView = new BStringView(BRect(kTextControlLeft,
+        kTextControlTop, kTextControlRight,
+        kTextControlTop + kTextControlHeight),
+        "", B_TRANSLATE("Owner"));
     strView->SetAlignment(B_ALIGN_CENTER);
     strView->SetFontSize(kAttribFontHeight);
     AddChild(strView);
@@ -138 +156 @@
     fOwnerTextControl->SetDivider(0);
     AddChild(fOwnerTextControl);
 
-    strView = new BStringView(BRect(kTextControlLeft, kTextControlTop + 5
-        + 2 * kTextControlSpacing, kTextControlRight, kTextControlTop + 2
-        + 2 * kTextControlSpacing + kTextControlHeight), "", "Group");
+    strView = new BStringView(BRect(kTextControlLeft,
+        kTextControlTop + 5 + 2 * kTextControlSpacing,
+        kTextControlRight,
+        kTextControlTop + 2 + 2 * kTextControlSpacing + kTextControlHeight),
+        "", B_TRANSLATE("Group"));
     strView->SetAlignment(B_ALIGN_CENTER);
     strView->SetFontSize(kAttribFontHeight);
     AddChild(strView);

CountView.cpp

@@ -37 +37 @@
 #include "CountView.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <ControlLook.h>
+#include <Locale.h>
 
 #include "AutoLock.h"
 #include "Bitmaps.h"
 #include "ContainerWindow.h"
 #include "DirMenu.h"
 #include "PoseView.h"
+#include "Utilities.h"
 
 
 const bigtime_t kBarberPoleDelay = 500000;
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 BCountView::BCountView(BRect bounds, BPoseView* view)
     : BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
             B_PULSE_NEEDED | B_WILL_DRAW),
@@ -217 +223 @@
         itemString << fLastCount << " " << Filter();
     } else {
         if (fLastCount == 0)
-            itemString << "no items";
+            itemString << B_TRANSLATE("no items");
         else if (fLastCount == 1)
-            itemString << "1 item";
-        else
-            itemString << fLastCount << " items";
+            itemString << B_TRANSLATE("1 item");
+        else {
+            itemString.SetTo(B_TRANSLATE("%num items"));
+            char numString[256];
+            sprintf(numString, "%ld", fLastCount);
+            itemString.ReplaceFirst("%num", numString);
+        }
     }
 
-    BString string(itemString);
     BRect textRect(TextInvalRect());
 
-    TruncateString(&string, IsTypingAhead() ? B_TRUNCATE_BEGINNING
+    TruncateString(&itemString, IsTypingAhead() ? B_TRUNCATE_BEGINNING
             : IsFiltering() ? B_TRUNCATE_MIDDLE : B_TRUNCATE_END,
         textRect.Width());
 
@@ -238 +247 @@
         SetHighColor(0, 0, 0);
 
     MovePenTo(textRect.LeftBottom());
-    DrawString(string.String());
+    DrawString(itemString.String());
 
     bounds.top++;
 

FavoritesMenu.cpp

@@ -37 +37 @@
 #include <compat/sys/stat.h>
 
 #include <Application.h>
+#include <Catalog.h>
 #include <FindDirectory.h>
 #include <FilePanel.h>
+#include <Locale.h>
 #include <Message.h>
 #include <Path.h>
 #include <Query.h>
@@ -56 +58 @@
 #include "Utilities.h"
 
 
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "libTracker"
+
 FavoritesMenu::FavoritesMenu(const char *title, BMessage *openFolderMessage,
     BMessage *openFileMessage, const BMessenger &target,
     bool isSavePanel, BRefFilter *filter)
@@ -166 +172 @@
 
             if (!fAddedSeparatorForSection) {
                 fAddedSeparatorForSection = true;
-                AddItem(new TitledSeparatorItem("Favorites"));
+                AddItem(new TitledSeparatorItem(
+                    B_TRANSLATE("Favorites")));
             }
             fUniqueRefCheck.push_back(*model.EntryRef());
             AddItem(item);
@@ -211 +218 @@
                 if (item) {
                     if (!fAddedSeparatorForSection) {
                         fAddedSeparatorForSection = true;
-                        AddItem(new TitledSeparatorItem("Recent documents"));
+                        AddItem(new TitledSeparatorItem(
+                            B_TRANSLATE("Recent documents")));
                     }
                     AddItem(item);
                     fSectionItemCount++;
@@ -253 +261 @@
 
             if (!ShouldShowModel(&model))
                 return true;
-            
             BMenuItem *item = BNavMenu::NewModelItem(&model, fOpenFolderMessage,
                 fTarget, true);
             if (item) {
                 if (!fAddedSeparatorForSection) {
                     fAddedSeparatorForSection = true;
-                    AddItem(new TitledSeparatorItem("Recent folders"));
+                    AddItem(new TitledSeparatorItem(
+                        B_TRANSLATE("Recent folders")));
                 }
                 AddItem(item);
                 item->SetEnabled(true);
@@ -436 +444 @@
     //
 
     if (CountItems() <= 0) {
-        BMenuItem *item = new BMenuItem("<No recent items>", 0);
+        BMenuItem* item = new BMenuItem(
+            B_TRANSLATE("<No recent items>"), 0);
         item->SetEnabled(false);
         AddItem(item);
     } else