Ticket #7233: pe-Sources-localization.patch

Sources/Pe.rdef

@@ +1 @@
+/*
+ * Pe.rdef
+ */
+
+resource app_signature "application/x-vnd.Haiku-Pe";
+
+resource app_version {
+    major  = 1,
+    middle = 0,
+    minor  = 0,
+    variety = 0,
+    internal = 0,
+    short_info = "1.0.0",
+    long_info = "Haiku Pe editor."
+};

Sources/CLanguageInterface.cpp

@@ -33 +33 @@
     Created: 09/19/97 10:49:36
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "PText.h"
 #include "CLanguageInterface.h"
@@ -49 +51 @@
 #include <algorithm>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Language Interface"
+
 using std::map;
 
 
@@ -76 +81 @@
 
 ext::ext(const char *e)
 {
-    if (strlen(e) > 11) THROW(("Extension `%s' is too long", e));
+    if (strlen(e) > 11) THROW((B_TRANSLATE("Extension `%s' is too long"), e));
 
     strcpy(t, e);
 } /* CLanguageInterface::ext::ext */
@@ -99 +104 @@
     if (sfWordBreakTable == NULL)
     {
         sfWordBreakTable = (unsigned char *)HResources::GetResource(rtyp_Wbrt, rid_Wbrt_WordbreakTable);
-        if (sfWordBreakTable == NULL) THROW(("Missing Resource!"));
+        if (sfWordBreakTable == NULL) THROW((B_TRANSLATE("Missing Resource!")));
     }
 
 //  fImage = -1;
@@ -108 +113 @@
     fScanForFunctions = NULL;
     fColorLine = NULL;
     fFindNextWord = NULL;
-    fLanguage = "None";
+    fLanguage = B_TRANSLATE("None");
     fExtensions = "";
     fKeywordFile = NULL;
     fLineCommentStart = fLineCommentEnd = "";
@@ -121 +126 @@
     if (sfWordBreakTable == NULL)
     {
         sfWordBreakTable = (unsigned char *)HResources::GetResource(rtyp_Wbrt, rid_Wbrt_WordbreakTable);
-        if (sfWordBreakTable == NULL) THROW(("Missing Resource!"));
+        if (sfWordBreakTable == NULL) THROW((B_TRANSLATE("Missing Resource!")));
     }
 
     fImage = image;
-    if (fImage < 0) THROW(("Error loading language extension: %s", strerror(fImage)));
+    if (fImage < 0) THROW((B_TRANSLATE("Error loading language extension: %s"), strerror(fImage)));
 
     if (get_image_symbol(fImage, "Balance", B_SYMBOL_TYPE_TEXT, (void**)&fBalance) != B_OK)
         fBalance = NULL;
@@ -144 +149 @@
     get_image_symbol(fImage, "kInterfaceVersion", B_SYMBOL_TYPE_DATA, (void**)&versionPtr);
     fInterfaceVersion = versionPtr ? *versionPtr : 1;
     if (fInterfaceVersion < 2) {
-        BString err("Unsupported Language:\n");
+        BString err(B_TRANSLATE("Unsupported Language:\n"));
         err << path;
         THROW((err.String()));
     }
@@ -207 +212 @@
             if (next > B_ERROR &&
                 (err = get_image_symbol(next, "kLanguageName", B_SYMBOL_TYPE_DATA, (void**)&l)) == B_OK)
             {
-                if (strlen(l) > 28) THROW(("Language name too long"));
+                if (strlen(l) > 28) THROW((B_TRANSLATE("Language name too long")));
                 CLanguageInterface *intf = new CLanguageInterface(plug, next);
                 fInterfaces.push_back(intf);
 
@@ -573 +578 @@
 {
     char extPref[64];
 
-    if (strlen(fLanguage) > 32) THROW(("Language name too long: %s", fLanguage));
+    if (strlen(fLanguage) > 32) THROW((B_TRANSLATE("Language name too long: %s"), fLanguage));
     strcpy(extPref, fLanguage);
     strcat(extPref, ".ext");
 
@@ -592 +597 @@
 
 void CLanguageInterface::ChooseDefault()
 {
-    const char *d = gPrefs->GetPrefString(prf_S_DefLang, "None");
+    const char *d = gPrefs->GetPrefString(prf_S_DefLang, B_TRANSLATE("None"));
     vector<CLanguageInterface*>::iterator i;
 
     for (i = fInterfaces.begin(); i != fInterfaces.end(); i++)
@@ -705 +710 @@
 
         BEntry e;
         FailOSErrMsg(e.SetTo(p.String(), B_FILE_NODE),
-                         "Settings directory was not found?");
+                         B_TRANSLATE("Settings directory was not found?"));
 
         BString keywords;
         if (!e.Exists())
@@ -723 +728 @@
             size_t s;
             const char *r = (const char*)res.LoadResource('KeyW', fKeywordFile, &s);
 
-            if (!r) THROW(("Missing resource"));
+            if (!r) THROW((B_TRANSLATE("Missing resource")));
 
             BFile txtfile(p.String(), B_CREATE_FILE | B_READ_WRITE);
             CheckedWrite(txtfile, r, s);

Sources/HStream.h

@@ -40 +40 @@
 
 #include "HError.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Stream"
+
 template <class S>
 class HStream
 {
@@ -109 +114 @@
 inline IMPEXP_LIBHEKKEL BPositionIO& operator>>(BPositionIO& s, D& d)
 {
     if (s.Read(&d, sizeof(D)) != sizeof(D))
-        throw HErr("Error reading");
+        throw HErr(B_TRANSLATE("Error reading"));
     return s;
 } /* operator>> */
 
@@ -123 +128 @@
 inline IMPEXP_LIBHEKKEL BPositionIO& operator<<(BPositionIO& s, const D& d)
 {
     if (s.Write(&d, sizeof(D)) != sizeof(D))
-        throw HErr("Error writing");
+        throw HErr(B_TRANSLATE("Error writing"));
     return s;
 } /* operator<< */
 
@@ -132 +137 @@
 {
     int sl = strlen(string) + 1;
     if (stream.Write(string, sl) != sl)
-        throw HErr("Error writing");
+        throw HErr(B_TRANSLATE("Error writing"));
     return stream;
 } /* operator<< */
 

Sources/utf-support.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <String.h>
 
 #include "HAppResFile.h"
@@ -42 +43 @@
 #include "ResourcesUtf.h"
 #include "utf-support.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Utf Support"
+
 unsigned char *alphaTable, *numTable, *alnumTable;
 
 unsigned short *mappings[11];
@@ -272 +276 @@
 int maptounicode(int charset, char ch)
 {
     if (charset < 1 || charset > 11 || mappings[charset - 1] == NULL)
-        THROW(("unsupported characterset: %d", charset - 1));
+        THROW((B_TRANSLATE("unsupported characterset: %d"), charset - 1));
     
     return mappings[charset - 1][(int)(unsigned char)ch];
 } /* maptounicode */
@@ -408 +412 @@
     if (IsSupportedEncoding(encoding))
         return gEncodings[encoding];
     else
-        return "<unknown encoding>";
+        return B_TRANSLATE("<unknown encoding>");
 }
 
 CTextEncodingConverter::CTextEncodingConverter()

Sources/CListBox.cpp

@@ -33 +33 @@
     Created: 10/20/97 20:08:37
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CListBox.h"
 #include "PMessages.h"
@@ -41 +43 @@
 #include "HDefines.h"
 #include "HDialog.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C List Box"
+
 const unsigned long
     msg_LBAdd = 'lbAd',
     msg_LBChange = 'lbCn',
@@ -67 +72 @@
     float dy = 30 * gFactor;
     b.bottom = b.top + 20 * gFactor;
     
-    AddChild(fAdd = new BButton(b, "add", "Add", new BMessage(msg_LBAdd)));
+    AddChild(fAdd = new BButton(b, "add", B_TRANSLATE("Add"), new BMessage(msg_LBAdd)));
     b.OffsetBy(0, dy);
-    AddChild(fChange = new BButton(b, "change", "Change", new BMessage(msg_LBChange)));
+    AddChild(fChange = new BButton(b, "change", B_TRANSLATE("Change"), new BMessage(msg_LBChange)));
     b.OffsetBy(0, dy);
-    AddChild(fDelete = new BButton(b, "delete", "Delete", new BMessage(msg_LBDelete)));
+    AddChild(fDelete = new BButton(b, "delete", B_TRANSLATE("Delete"), new BMessage(msg_LBDelete)));
     
     fSelfChange = false;
 } // CListBox::CListBox

Sources/PGlossyWindow.cpp

@@ -45 +45 @@
 #include "HPreferences.h"
 #include "Prefs.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Glossy Window"
+
 PGlossyWindow *gGlossyWindow = NULL;
 
 class PGlossyItem : public BListItem {
@@ -117 +122 @@
 
 PGlossyWindow::PGlossyWindow()
     : BWindow(gPrefs->GetPrefRect(prf_R_GlossaryPosition, BRect(100, 100, 200, 300)),
-        "Glossary", B_TITLED_WINDOW,
+        B_TRANSLATE("Glossary"), B_TITLED_WINDOW,
         B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE)
 {
     BRect r(Bounds());
@@ -248 +253 @@
 
     file >> s;
     
-    if (strncmp(s, "### ", 4)) THROW(("Invalid glossary file"));
+    if (strncmp(s, "### ", 4)) THROW((B_TRANSLATE("Invalid glossary file")));
     
     file >> s;
     while (*s && strncmp(s, "##", 2) == 0)

Sources/CMimeBox.cpp

@@ -33 +33 @@
     Created: 10/23/97 09:38:06
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CListBox.h"
 #include "CMimeBox.h"
@@ -43 +45 @@
 #include "HPreferences.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Mime Box"
+
 const unsigned long
     msg_MimeChanged = 'MChg',
     msg_MimeFind = 'MFnd',
@@ -156 +161 @@
     r.bottom = Bounds().bottom;
     
 //  r.right -= 70;
-    AddChild(fEdit = new BTextControl(r, "edit mime", "Mimetype:",
+    AddChild(fEdit = new BTextControl(r, "edit mime", B_TRANSLATE("Mimetype:"),
         NULL, new BMessage(msg_MimeChanged)));
     
-    fEdit->SetDivider(be_plain_font->StringWidth("Mimetype:") + 4);
+    fEdit->SetDivider(be_plain_font->StringWidth(B_TRANSLATE("Mimetype:")) + 4);
     fEdit->SetModificationMessage(new BMessage(msg_MimeChanged));
     
     r.left = r.right + 10;
     r.right = r.left + 60;
     r.top = r.bottom - 24 * gFactor;
-    AddChild(fGet = new BButton(r, "get", "Find…", new BMessage(msg_MimeFind)));
+    AddChild(fGet = new BButton(r, "get", B_TRANSLATE("Find…"), new BMessage(msg_MimeFind)));
     
     fAdd->SetEnabled(false);
     fChange->SetEnabled(false);
@@ -285 +290 @@
             {
                 fPanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this),
                     NULL, B_FILE_NODE, true, new BMessage(msg_MimeFound));
-                fPanel->SetButtonLabel(B_DEFAULT_BUTTON, "Pick");
+                fPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Pick"));
                 fPanel->Show();
             }
             break;

Sources/PStatus.cpp

@@ -33 +33 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
+
 #include "PText.h"
 #include "PStatus.h"
 #include "Utils.h"
@@ -43 +45 @@
 #include "HError.h"
 #include "HDefines.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Status"
+
 PStatus::PStatus(BRect frame, PText *txt)
     : BView(frame, "status", B_FOLLOW_BOTTOM | B_FOLLOW_LEFT, B_WILL_DRAW)
 {
@@ -135 +140 @@
 
     if (fPath)
     {
-        BPopUpMenu popup("no title");
+        BPopUpMenu popup(B_TRANSLATE("no title"));
         popup.SetFont(be_plain_font);
         
         char *s = strdup(fPath), *d;

Sources/PGroupWindow.cpp

@@ -33 +33 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <fs_attr.h>
 #include <String.h>
 
@@ -54 +55 @@
 #include "ResourcesToolbars.h"
 #include "Utils.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Group Window"
 
 const unsigned long msg_Done = 'done';
 
@@ -258 +261 @@
     try
     {
         if (docText.Compare("### pe Group File\n", 18) != 0)
-            THROW(("Not a group file!"));
+            THROW((B_TRANSLATE("Not a group file!")));
 
         if (!EntryRef())
-            THROW(("Can only read local groups"));
+            THROW((B_TRANSLATE("Can only read local groups")));
 
         node_ref nref;
         nref.device = EntryRef()->device;
@@ -397 +400 @@
 
 const char* PGroupWindow::DefaultName() const
 {
-    return "Untitled Group";
+    return B_TRANSLATE("Untitled Group");
 }
 
 PEntryItem* PGroupWindow::AddRef(entry_ref& ref)
@@ -437 +440 @@
         }
 
         fPanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), &ref);
-        fPanel->SetButtonLabel(B_DEFAULT_BUTTON, "Add");
+        fPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Add"));
         fPanel->Show();
     }
 } /* PGroupWindow::AddFiles */

Sources/CGlossary.cpp

@@ -33 +33 @@
     Created: 09/10/97 15:20:13
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CGlossary.h"
 #include "PApp.h"
@@ -40 +42 @@
 #include "Utils.h"
 #include "HError.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Glossary"
+
 CGlossary *gGlossary;
 
 CGlossary::CGlossary()
@@ -180 +185 @@
     
     fgets(s, 255, file);
     
-    if (strncmp(s, "### ", 4)) THROW(("Invalid glossary file"));
+    if (strncmp(s, "### ", 4)) THROW((B_TRANSLATE("Invalid glossary file")));
     
     fgets(s, 255, file);
     while (!feof(file) && strncmp(s, "##", 2) == 0)
@@ -208 +213 @@
             else if (tolower(*kp) == 'f')
                 key |= strtol(kp + 1, &kp, 10) + 1 | 0x0100;
             else
-                THROW(("Incorrect Glossary File, unrecognized keyword %s", kp));
+                THROW((B_TRANSLATE("Incorrect Glossary File, unrecognized keyword %s"), kp));
 
             kp = strtok(NULL, " -\n");
         }

Sources/HDialog.h

@@ -36 +36 @@
 #ifndef HDIALOG_H
 #define HDIALOG_H
 
+#include <Catalog.h>
+
 #include "HLibHekkel.h"
 
 #include "HStream.h"
 #include "HAppResFile.h"
 #include "HPreferences.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Dialog"
+
 struct IMPEXP_LIBHEKKEL dRect {
     short left, top, right, bottom;
 
@@ -79 +84 @@
 {
     size_t size;
     const void *p = HResources::GetResource('DLOG', T::sResID, size);
-    if (!p) throw HErr("missing resource");
+    if (!p) throw HErr(B_TRANSLATE("missing resource"));
     BMemoryIO buf(p, size);
 
     T *d = CreateDialog(owner, buf, placement);

Sources/PCmd.cpp

@@ -43 +43 @@
 #include "PApp.h"
 #include "PErrorWindow.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Cmd"
+
 PCmd::PCmd(const char *str, PText *txt)
 {
     fStr = strdup(str);
@@ -72 +77 @@
 #pragma mark - Copy
 
 PCutCmd::PCutCmd(PText *txt, int append)
-    : PCmd("Cut", txt)
+    : PCmd(B_TRANSLATE("Cut"), txt)
 {
     fSavedTxt = NULL;
     fAnchor = txt->Anchor();
@@ -112 +117 @@
 #pragma mark -
 
 PClearCmd::PClearCmd(PText *txt)
-    : PCmd("Clear", txt)
+    : PCmd(B_TRANSLATE("Clear"), txt)
 {
     fSavedTxt = NULL;
     fAnchor = txt->Anchor();
@@ -151 +156 @@
 #pragma mark -
 
 PPasteCmd::PPasteCmd(PText *txt)
-    : PCmd("Paste", txt)
+    : PCmd(B_TRANSLATE("Paste"), txt)
 {
     fSavedTxt = NULL;
 } /* PPasteCmd::PPasteCmd */
@@ -214 +219 @@
 
 #pragma mark --- Typing Command ---
 PTypingCmd::PTypingCmd(PText *txt)
-    : PCmd("Typing", txt)
+    : PCmd(B_TRANSLATE("Typing"), txt)
 {
 } /* PTypingCmd::PTypingCmd */
 
@@ -353 +358 @@
 #pragma mark --- Drop Command ---
 
 PDropCmd::PDropCmd(PText *txt, const char *data, ssize_t dataLen, int srcLoc, int dstLoc)
-    : PCmd("Drop", txt)
+    : PCmd(B_TRANSLATE("Drop"), txt)
 {
     fData = (char *)malloc(fDataLen = dataLen);
     FailNil(fData);
@@ -518 +523 @@
 #pragma mark --- PReplaceCmd
 
 PReplaceCmd::PReplaceCmd(PText *txt, int offset, int size, bool findNext, bool backward)
-    : PCmd("Replace", txt)
+    : PCmd(B_TRANSLATE("Replace"), txt)
 {
     fOffset = offset;
     fSize = size;
@@ -593 +598 @@
 #pragma mark --- PReplaceAllCmd
 
 PReplaceAllCmd::PReplaceAllCmd(PText *txt)
-    : PCmd("Replace All", txt)
+    : PCmd(B_TRANSLATE("Replace All"), txt)
 {
     fFind = strdup(gFindDialog->FindString());
     fRepl = strdup(gFindDialog->ReplaceString());
@@ -706 +711 @@
     kBufferSize = 1024;
 
 PScriptCmd::PScriptCmd(PText *txt, const char *script)
-    : PCmd("Script", txt)
+    : PCmd(B_TRANSLATE("Script"), txt)
 {
     char buf[PATH_MAX];
     
@@ -958 +963 @@
 } /* PShiftCmd::LastLine */
 
 PShiftLeftCmd::PShiftLeftCmd(PText *txt)
-    : PShiftCmd("Shift Left", txt)
+    : PShiftCmd(B_TRANSLATE("Shift Left"), txt)
 {
     // count the involved hard lines
     int firstLine = FirstLine();
@@ -1061 +1066 @@
 
 
 PShiftRightCmd::PShiftRightCmd(PText *txt)
-    : PShiftCmd("Shift Right", txt)
+    : PShiftCmd(B_TRANSLATE("Shift Right"), txt)
 {
 } /* PShiftRightCmd::PShiftRightCmd */
 
@@ -1112 +1117 @@
 #pragma mark --- Twiddle Command ---
 
 PTwiddleCmd::PTwiddleCmd(PText *txt)
-    : PCmd("Twiddle", txt)
+    : PCmd(B_TRANSLATE("Twiddle"), txt)
 {
     fFrom = std::min(fText->Caret(), fText->Anchor());
     fTo = std::max(fText->Caret(), fText->Anchor());
@@ -1183 +1188 @@
 
 PCommentCmd::PCommentCmd(PText *txt, bool comment,
             const char *before, const char *after)
-    : PCmd(comment ? "Comment" : "Uncomment", txt)
+    : PCmd(comment ? B_TRANSLATE("Comment") : B_TRANSLATE("Uncomment"), txt)
 {
     fComment = comment;
     
     fFrom = std::min(fText->Caret(), fText->Anchor());
     fTo = std::max(fText->Caret(), fText->Anchor());
     
-    if (strlen(before) > 7 || strlen(after) > 7) THROW(("comment strings too long"));
+    if (strlen(before) > 7 || strlen(after) > 7) THROW((B_TRANSLATE("comment strings too long")));
     
     strcpy(fBefore, before);
     strcpy(fAfter, after);
@@ -1318 +1323 @@
 #pragma mark --- Wrap Command ---
 
 PWrapCmd::PWrapCmd(PText *txt)
-    : PCmd("Wrap", txt)
+    : PCmd(B_TRANSLATE("Wrap"), txt)
 {
     fCaret = txt->Caret();
     fAnchor = txt->Anchor();
@@ -1358 +1363 @@
 #pragma mark --- Unwrap Command ---
 
 PUnwrapCmd::PUnwrapCmd(PText *txt)
-    : PCmd("Unwrap", txt)
+    : PCmd(B_TRANSLATE("Unwrap"), txt)
 {
     fCaret = txt->Caret();
     fAnchor = txt->Anchor();
@@ -1405 +1410 @@
 #pragma mark --- Justify Command ---
 
 PJustifyCmd::PJustifyCmd(PText *txt)
-    : PCmd("Justify", txt)
+    : PCmd(B_TRANSLATE("Justify"), txt)
 {
 } /* PJustifyCmd::PJustifyCmd */
 
@@ -1484 +1489 @@
 #pragma mark --- Change Case Command ---
 
 PChangeCaseCmd::PChangeCaseCmd(PText *txt, int newCase)
-    : PCmd("Change Case", txt)
+    : PCmd(B_TRANSLATE("Change Case"), txt)
 {
     fText->GetSelectedText(fSavedText);
     
@@ -1603 +1608 @@
 #pragma mark --- Change Encoding Command ---
 
 PEncodingCmd::PEncodingCmd(PText *txt, int from, int to)
-    : PCmd("Change Encoding", txt)
+    : PCmd(B_TRANSLATE("Change Encoding"), txt)
 {
     fSourceEncoding = from;
     fDestEncoding = to;

Sources/CDocIO.cpp

@@ -6 +6 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <NodeMonitor.h>
 #include <fs_attr.h>
 #include <String.h>
@@ -18 +19 @@
 #include "MAlert.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Doc IO"
+
 static void ConvertLinebreaks(BString& str, int fromType, int toType)
 {
     const char* lbStr[] = {
@@ -347 +351 @@
     {
         BString err;
         if (fDoc->Encoding() != B_UNICODE_UTF8)
-            err = BString("An error occurred when converting the document ")
-                    << "from its native encoding to UTF-8. The first "
-                    << "problematic character is highlighted.\n"
-                    << "Please use the 'File Options'-dialog to select "
-                    << "the correct source encoding.";
+            err = BString(B_TRANSLATE("An error occurred when "
+              "converting the document from its native encoding "
+              "to UTF-8. The first problematic character is "
+              "highlighted.\nPlease use the 'File Options'-dialog "
+              "to select the correct source encoding."));
+
         else
-            err = BString("An error occurred when checking the document's ")
-                    << "UTF-8 encoding. The first problematic character is "
-                    << "highlighted.\n"
-                    << "Please use the 'File Options'-dialog to select "
-                    << "the correct source encoding.";
+            err = BString(B_TRANSLATE("An error occurred when "
+              "checking the document's UTF-8 encoding. The first "
+              "problematic character is highlighted.\nPlease use "
+              "the 'File Options'-dialog to select the correct "
+              "source encoding."));
         fDoc->SetErrorMsg(err.String());
         return false;
     }
@@ -381 +386 @@
         {
             fDoc->HighlightErrorPos(fConv.ErrorPos());
             BString err =
-                BString("An error occurred when converting the document ")
-                    << "to the requested destination encoding. The first "
-                    << "problematic character is highlighted.\n"
-                    << "Please use the 'File Options'-dialog to select "
-                    << "another destination encoding.";
-            MInfoAlert a(err.String(), "I See");
+                BString(B_TRANSLATE("An error occurred when "
+                  "converting the document to the requested "
+                  "destination encoding. The first problematic"
+                  " character is highlighted.\nPlease use the "
+                  "'File Options'-dialog to select another "
+                  "destination encoding."));
+            MInfoAlert a(err.String(), B_TRANSLATE("I See"));
             a.Go();
             return false;
         }
@@ -463 +469 @@
         int bytesRead = file.Read(buf, size);
         docText.UnlockBuffer(size);
         if (bytesRead < size)
-            THROW(("A read error occurred: %s", strerror(errno)));
+            THROW((B_TRANSLATE("A read error occurred: %s"),
+                   strerror(errno)));
     }
 
     if (readAttributes)
@@ -742 +749 @@
                 && _HasFileContentsChanged(file))
             {
                 char s[PATH_MAX + 20];
-                sprintf(s, "File %s was modified by another application, reload it?", fEntryRef->name);
-                MInfoAlert a(s, "Reload", "Cancel");
+                sprintf(s, B_TRANSLATE("File %s was modified "
+                  "by another application, reload it?"),
+                  fEntryRef->name);
+                MInfoAlert a(s, B_TRANSLATE("Reload"),
+                         B_TRANSLATE("Cancel"));
 
                 if (a.Go() == 1)
                 {
@@ -876 +886 @@
     int sz = ftp.ReadAt(0, buf, size);
     docText.UnlockBuffer(size);
     if (sz < size)
-        THROW(("A read error occurred: %s", strerror(errno)));
+        THROW((B_TRANSLATE("A read error occurred: %s"),
+               strerror(errno)));
 
     if (readAttributes)
     {

Sources/HAppResFile.cpp

@@ -33 +33 @@
     Created: 02-06-02
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "HAppResFile.h"
 #include "HError.h"
 #include "HStream.h"
 #include "ResourcesMenus.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H App Res File"
+
 using namespace HResources;
 
 BResources *gAppResFile = NULL;
@@ -76 +81 @@
 {
     size_t size;
     const char *m = (char *)GetResource(rtyp_Menu, id, size);
-    if (!m) throw HErr("Could not find resource!");
+    if (!m) throw HErr(B_TRANSLATE("Could not find resource!"));
     
     BMemoryIO buf(m, size);
     BPositionIO& data = buf;

Sources/HDialog.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <Slider.h>
 
 #include "HDialog.h"
@@ -46 +47 @@
 #include "HError.h"
 #include "MAlert.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Dialog"
+
 const unsigned long
     msg_AddDialog       = 'ADlg',
     msg_RemoveDialog    = 'RDlg';
@@ -358 +362 @@
 
     if (isnan(d))
     {
-        MWarningAlert a("Invalid number entered");
+        MWarningAlert a(B_TRANSLATE("Invalid number entered"));
         a.Go();
         FindView(name)->MakeFocus(true);
         return false;
@@ -510 +514 @@
             if (sFieldMap && sFieldMap->find(kind) != sFieldMap->end())
                 (*sFieldMap)[kind](kind, data, inside);
             else
-                throw HErr("Unknown type for dialog item (%4.4s)", &kind);
+                throw HErr(B_TRANSLATE("Unknown type for dialog item (%4.4s)"), &kind);
         }
     }
 } /* HDialog::CreateField */
@@ -544 +548 @@
 int HDialog::GetValue(const char *id) const
 {
     BView *v = FindView(id);
-    if (v == NULL) THROW(("View '%s' not found", id));
+    if (v == NULL) THROW((B_TRANSLATE("View '%s' not found"), id));
 
         // according to stroustrup I shouldn't do this:
 
@@ -558 +562 @@
     else if (typeid(*v) == typeid(BSlider))
         return static_cast<BSlider*>(v)->Value();
 
-    THROW(("view '%s' not of valid type", id));
+    THROW((B_TRANSLATE("view '%s' not of valid type"), id));
     return 0;
 } // HDialog::GetValue
 
 void HDialog::SetValue(const char *id, int value)
 {
     BView *v = FindView(id);
-    if (v == NULL) THROW(("View '%s' not found", id));
+    if (v == NULL) THROW((B_TRANSLATE("View '%s' not found"), id));
 
     if (typeid(*v) == typeid(BMenuField))
     {
@@ -588 +592 @@
         return;
     }
 
-    THROW(("view '%s' not found", id));
+    THROW((B_TRANSLATE("view '%s' not found"), id));
 } // HDialog::SetValue
 
 void HDialog::SetLabel(const char *id, const char *label)
@@ -597 +601 @@
     if (control)
         control->SetLabel(label);
     else
-        THROW(("Control '%s' not found", id));
+        THROW((B_TRANSLATE("Control '%s' not found"), id));
 } // HDialog::SetLabel
 
 filter_result HDialog::KeyDownFilter(BMessage* msg, BHandler**,

Sources/CDoc.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <String.h>
 
 #include "CDoc.h"
@@ -47 +48 @@
 #include "PMessages.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Doc"
+
 doclist CDoc::sfDocList;
 vector<char*> CDoc::sfTenLastDocs;
 
@@ -126 +130 @@
 void CDoc::Read(bool readAttributes)
 {
     if (!fDocIO)
-        THROW(("No file available"));
+        THROW((B_TRANSLATE("No file available")));
 
     fDocIO->ReadDoc(readAttributes);
 }
@@ -136 +140 @@
     try
     {
         if (!fDocIO)
-            THROW(("No file available"));
+            THROW((B_TRANSLATE("No file available")));
         // Only save directly if the file is writable and if we already
         // have a place (entry) for the file
         if (!fReadOnly && (!fDocIO->IsLocal() || EntryRef()))
@@ -171 +175 @@
     w->Lock();
 
     char s[256];
-    sprintf(s, "Save %s as:", Name());
+    sprintf(s, B_TRANSLATE("Save %s as:"), Name());
 
     w->SetTitle(s);
     fSavePanel->SetSaveText(Name());
@@ -270 +274 @@
     w->Lock();
 
     char s[256];
-    sprintf(s, "Save a copy of %s as:", Name());
+    sprintf(s, B_TRANSLATE("Save a copy of %s as:"), Name());
 
     w->SetTitle(s);
     fSavePanel->SetSaveText(Name());
@@ -336 +340 @@
 void CDoc::Revert()
 {
     char title[256];
-    sprintf(title, "Revert to the last saved version of %s?", Name());
+    sprintf(title, B_TRANSLATE("Revert to the last saved version of %s?"),
+        Name());
 
-    MInfoAlert a(title, "Cancel", "OK");
+    MInfoAlert a(title, B_TRANSLATE("Cancel"), B_TRANSLATE("OK"));
     if (a == 2)
     {
         Read();
@@ -350 +355 @@
 {
     if ((readOnly && fDirty) || !EntryRef())
     {
-        MWarningAlert a("You have to save the file first before marking it read-only");
+        MWarningAlert a(B_TRANSLATE("You have to save the file first before marking it read-only"));
         a.Go();
     }
     else
@@ -402 +407 @@
 
 const char* CDoc::DefaultName() const
 {
-    return "Untitled";
+    return B_TRANSLATE("Untitled");
 }
 
 const char* CDoc::Name() const

Sources/CUrlOpener.cpp

@@ -33 +33 @@
     Created: 04/26/98 21:16:08
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "PApp.h"
 #include "CUrlOpener.h"
@@ -40 +42 @@
 #include "CFtpStream.h"
 #include "PDoc.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Url Opener"
+
 CUrlOpener::CUrlOpener(const char *url)
     : fURL(url)
 {
@@ -62 +67 @@
         URLData& url = fURL;
         
         if (! url.IsValid())
-            THROW(("Url \"ftp:://%s/%s/%s\" is not valid", fURL.Server(), fURL.Path(), fURL.File()));
+            THROW((B_TRANSLATE("Url \"ftp:://%s/%s/%s\" is not valid"), fURL.Server(), fURL.Path(), fURL.File()));
         
         bool ok;
 

Sources/CStdErrBox.cpp

@@ -33 +33 @@
     Created: 02/22/98 22:12:11
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CListBox.h"
 #include "CStdErrBox.h"
@@ -42 +44 @@
 #include "HPreferences.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Std Err Box"
+
 const unsigned long
     msg_ChangedPattern = 'ECnm';
 
@@ -108 +113 @@
     
     BTextControl *t;
 
-    AddChild(t = new BTextControl(r, "SEpt", "Pattern:",
+    AddChild(t = new BTextControl(r, "SEpt", B_TRANSLATE("Pattern:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     t->SetDivider(40 * gFactor);
@@ -117 +122 @@
     r.OffsetBy(0, 20 * gFactor);
     r.right = r.left + r.Width() / 2 - 10 * gFactor;
 
-    AddChild(t = new BTextControl(r, "SEfl", "File:",
+    AddChild(t = new BTextControl(r, "SEfl", B_TRANSLATE("File:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     t->SetDivider(40 * gFactor);
@@ -125 +130 @@
     
     r.OffsetBy(0, 20 * gFactor);
 
-    AddChild(t = new BTextControl(r, "SEln", "Line:",
+    AddChild(t = new BTextControl(r, "SEln", B_TRANSLATE("Line:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     t->SetDivider(40 * gFactor);
@@ -134 +139 @@
     r.OffsetBy(r.Width() + 10 * gFactor, -20 * gFactor);
     r.right += 10 * gFactor;
 
-    AddChild(t = new BTextControl(r, "SEms", "Message:",
+    AddChild(t = new BTextControl(r, "SEms", B_TRANSLATE("Message:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     t->SetDivider(50 * gFactor);
@@ -142 +147 @@
     
     r.OffsetBy(0, 20 * gFactor);
 
-    AddChild(t = new BTextControl(r, "SEwa", "Warning:",
+    AddChild(t = new BTextControl(r, "SEwa", B_TRANSLATE("Warning:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     t->SetDivider(50 * gFactor);

Sources/Jamfile

@@ -3 +3 @@
 
 SubDirHdrs $(OBJECTS_DIR) Sources ;
 
+AddResources Pe : Pe.rdef ;
+
 if $(OSPLAT) = X86 {
     C++FLAGS += -Wno-sign-compare -Wno-overloaded-virtual ;
 } else {
@@ -111 +113 @@
     utf-support.cpp
     Utils.cpp
     :   libhekkel.so pcre be $(STDC++LIB) tracker mail textencoding 
+    $(HAIKU_LOCALE_LIBS)
     ;
 #   </pe-src>
 if $(OSPLAT) = X86 {
@@ -143 +146 @@
 Rez Pe : [ FDirName $(TOP) Resources Now.r ] ;
 
 MimeSet Pe ;
+
+DoCatalogs Pe :
+  x-vnd.Haiku-Pe
+  :
+  CDiffWindow.cpp
+  CDoc.cpp
+  CDocWindow.cpp
+  CFilterChoiceDialog.cpp
+  CFindDialog.cpp
+  CFtpDialog.cpp
+  CFtpStream.cpp
+  CGlossary.cpp
+  CGoToLine.cpp
+  CGrepBox.cpp
+  CHtmlBar.cpp
+  CInfoDialog.cpp
+  CKeyMapper.cpp
+  CLanguageAddOn.cpp
+  CLanguageInterface.cpp
+  CListBox.cpp
+  CMimeBox.cpp
+  CPathsBox.cpp
+  CPrefsDialog.cpp
+  CRegex.cpp
+  CStdErrBox.cpp
+  CUrlOpener.cpp
+  HAppResFile.cpp
+  HDialog.cpp
+  HDialog.h
+  HError.cpp
+  HError.h
+  HLazyObject.cpp
+  HPreferences.cpp
+  HStream.h
+  MAlert.cpp
+  PAbout.cpp
+  PApp.cpp
+  PCmd.cpp
+  PDoc.cpp
+  PGlossyWindow.cpp
+  PGroupWindow.cpp
+  PItalicMenuItem.cpp
+  PMessageWindow.cpp
+  PProjectWindow.cpp
+  PStatus.cpp
+  PText.cpp
+  PTextBuffer.cpp
+  utf-support.cpp
+  Utils.cpp
+;

Sources/HError.cpp

@@ -34 +34 @@
 */
 
 #include "pe.h"
+
+#include <Catalog.h>
+
 #include <stdarg.h>
 #include "HError.h"
 #include "MAlert.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Error"
+
 HErr::HErr()
 {
 } /* HErr::HErr */
@@ -48 +54 @@
     fMessage[0] = 0;
     
     if (err == 0)
-        strcpy(fMessage, "No Error");
+        strcpy(fMessage, B_TRANSLATE("No Error"));
     else if (err < 0)
         strcpy(fMessage, strerror(err));
     else
-        sprintf(fMessage, "An unknown error occured (nr: %d)", err);
+        sprintf(fMessage, B_TRANSLATE("An unknown error occured (nr: %d)"), err);
 
 //#if DEBUG
 //  if (err)

Sources/CGrepBox.cpp

@@ -33 +33 @@
     Created: 02/22/98 22:12:11
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CListBox.h"
 #include "CGrepBox.h"
@@ -41 +43 @@
 #include "HDialog.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Grep Box"
+
 const unsigned long
     msg_ChangedPattern = 'GCnm';
 
@@ -89 +94 @@
     r.top = r.bottom + 10 * gFactor;
     r.bottom = r.top + 16 * gFactor;
     
-    AddChild(fName = new BTextControl(r, "edit mime", "Name:",
+    AddChild(fName = new BTextControl(r, "edit mime", B_TRANSLATE("Name:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     fName->SetDivider(40 * gFactor);
@@ -97 +102 @@
     
     r.OffsetBy(0, 20 * gFactor);
 
-    AddChild(fFind = new BTextControl(r, "edit mime", "Find:",
+    AddChild(fFind = new BTextControl(r, "edit mime", B_TRANSLATE("Find:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     fFind->SetDivider(40 * gFactor);
@@ -105 +110 @@
     
     r.OffsetBy(0, 20 * gFactor);
 
-    AddChild(fReplace = new BTextControl(r, "edit mime", "Replace:",
+    AddChild(fReplace = new BTextControl(r, "edit mime", B_TRANSLATE("Replace:"),
         NULL, new BMessage(msg_ChangedPattern)));
     
     fReplace->SetDivider(40 * gFactor);

Sources/CFilterChoiceDialog.cpp

@@ -10 +10 @@
 
 #include <Application.h>
 #include <Beep.h>
+#include <Catalog.h>
 #include <ListItem.h>
 #include <ListView.h>
 #include <Screen.h>
@@ -23 +24 @@
 #include "KeyBindings.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Filter Choice Dialog"
+
 // internal messages
 enum {
     MSG_COMMIT_REQUEST  = 'fico',
@@ -407 +411 @@
     FailNil(message);
     BRect rect(bounds);
     fFilterStringControl = new(std::nothrow) BTextControl(rect, "filter text",
-        "Filter", "", message,
+        B_TRANSLATE("Filter"), "", message,
         B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP, B_WILL_DRAW);
     FailNil(fFilterStringControl);
     fMainView->AddChild(fFilterStringControl);
     BFont labelFont;
     fFilterStringControl->GetFont(&labelFont);
-    fFilterStringControl->SetDivider(labelFont.StringWidth("Filter#"));
+    fFilterStringControl->SetDivider(labelFont.StringWidth(B_TRANSLATE("Filter#")));
     message = new BMessage(MSG_FILTER_MODIFIED);
     FailNil(message);
     fFilterStringControl->SetModificationMessage(message);

Sources/CDocWindow.cpp

@@ -35 +35 @@
 
 #include <algorithm>
 
+#include <Catalog.h>
 #include <NodeMonitor.h>
 #include <fs_attr.h>
 #include <String.h>
@@ -48 +49 @@
 #include "PMessages.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Doc Window"
 
 int CDocWindow::sfNewCount = -1;
 
 CDocWindow::CDocWindow(const entry_ref *doc)
-    : inheritedWindow(BRect(0,0,0,0), doc ? doc->name : "Untitled", B_DOCUMENT_WINDOW,
-                            B_ASYNCHRONOUS_CONTROLS)
+    : inheritedWindow(BRect(0,0,0,0), doc ? doc->name : 
+    B_TRANSLATE("Untitled"), B_DOCUMENT_WINDOW, B_ASYNCHRONOUS_CONTROLS)
     , inheritedDoc("", this, doc)
     , fCloseWinAfterSave(false)
     , fCloseAppAfterSave(false)
@@ -155 +158 @@
     if (IsDirty())
     {
         char title[256];
-        sprintf(title, "Save changes to '%s' before closing?", inheritedDoc::Name());
+        sprintf(title, B_TRANSLATE("Save changes to '%s' before "
+          "closing?"), inheritedDoc::Name());
 
         if (IsMinimized())
             Minimize(false);
@@ -163 +167 @@
 
         UnlockLooper();
 
-        MInfoAlert alert(title, "Save", "Cancel", "Don't save");
+        MInfoAlert alert(title, B_TRANSLATE("Save"), 
+                 B_TRANSLATE("Cancel"),
+                 B_TRANSLATE("Don't save"));
 
         int32 alertResult = alert.Go();
 
@@ -237 +243 @@
     // now that the window is shown, we might have to show any error alongside
     // it that may have ocurred during load (conversion failure):
     if (HadError()) {
-        MInfoAlert a(ErrorMsg(), "I See");
+        MInfoAlert a(ErrorMsg(), B_TRANSLATE("I See"));
         a.Go();
         ClearErrorMsg();
     }

Sources/CKeyMapper.cpp

@@ -33 +33 @@
     Created: 10/07/97 21:53:17
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 
 #include "HStream.h"
@@ -46 +48 @@
 #include "ResourcesBindings.h"
 #include "ResourcesUtf.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Key Mapper"
+
 CKeyMapper* CKeyMapper::sfInstance = NULL;
 
 void CKeyMapper::Init()
@@ -156 +161 @@
 void CKeyMapper::ReadKeymap(keymap& kmap)
 {
     static sem_id kmsem = create_sem(1, "reading keymap");
-    if (kmsem < 0) THROW(("Error creating semaphore"));
+    if (kmsem < 0) THROW((B_TRANSLATE("Error creating semaphore")));
     
     FailOSErr(acquire_sem(kmsem));
 
@@ -209 +214 @@
         b << cnt;
         
         if (file.Write(b.Buffer(), b.BufferLength()) != b.BufferLength())
-            THROW(("Error writing keybindings"));
+            THROW((B_TRANSLATE("Error writing keybindings")));
     }
     else
         FailOSErr(file.SetTo(&gPrefsDir, "keybindings", B_READ_ONLY));
@@ -224 +229 @@
     {
         cnt = __swap_int32(cnt);
         if (cnt != size / (sizeof(long) * 3))
-            THROW(("Invalid keybinding file!"));
+            THROW((B_TRANSLATE("Invalid keybinding file!")));
         
         while (cnt--)
         {

Sources/CFindDialog.cpp

@@ -364 +364 @@
 } // CFindDialog::Create
 
 void CFindDialog::Layout(void) {
-    fButFind    ->ResizeLocalized("Find");
-    fButRepl    ->ResizeLocalized("Replace");
-    fButRepF    ->ResizeLocalized("Replace & Find");
-    fButRepA    ->ResizeLocalized("Replace All");
-    fMfdPats    ->ResizeLocalized(NULL, "Find:");
-    fLabRepl    ->ResizeLocalized("Replace:");
-    fChkCase    ->ResizeLocalized("Ignore Case");
-    fChkWrap    ->ResizeLocalized("Wrap Around");
-    fChkBack    ->ResizeLocalized("Backwards");
-    fChkWord    ->ResizeLocalized("Entire Word");
-    fChkGrep    ->ResizeLocalized("Regex");
-    fChkBtch    ->ResizeLocalized("Batch");
-    fChkMult    ->ResizeLocalized("Multi-File:");
+    fButFind    ->ResizeLocalized(B_TRANSLATE("Find"));
+    fButRepl    ->ResizeLocalized(B_TRANSLATE("Replace"));
+    fButRepF    ->ResizeLocalized(B_TRANSLATE("Replace & Find"));
+    fButRepA    ->ResizeLocalized(B_TRANSLATE("Replace All"));
+    fMfdPats    ->ResizeLocalized(NULL, B_TRANSLATE("Find:"));
+    fLabRepl    ->ResizeLocalized(B_TRANSLATE("Replace:"));
+    fChkCase    ->ResizeLocalized(B_TRANSLATE("Ignore Case"));
+    fChkWrap    ->ResizeLocalized(B_TRANSLATE("Wrap Around"));
+    fChkBack    ->ResizeLocalized(B_TRANSLATE("Backwards"));
+    fChkWord    ->ResizeLocalized(B_TRANSLATE("Entire Word"));
+    fChkGrep    ->ResizeLocalized(B_TRANSLATE("Regex"));
+    fChkBtch    ->ResizeLocalized(B_TRANSLATE("Batch"));
+    fChkMult    ->ResizeLocalized(B_TRANSLATE("Multi-File:"));
     fMfdMeth    ->ResizeLocalized();
-    fMitMethDir ->SetLabel("Directory Scan");
-    fMitMethWin ->SetLabel("Open Windows");
+    fMitMethDir ->SetLabel(B_TRANSLATE("Directory Scan"));
+    fMitMethWin ->SetLabel(B_TRANSLATE("Open Windows"));
     fMitMethInc ->SetLabel("$BEINCLUDES");
-    fChkText    ->ResizeLocalized("Text Files Only");
-    fChkRecu    ->ResizeLocalized("Recursive");
-    fMfdSdir    ->ResizeLocalized("Search In:");
-    fMitSdirOth ->SetLabel("Other…");
-    fMfdNamp    ->ResizeLocalized("File Name:");
-    fMitNampAny ->SetLabel("Any");
-    fMitNampEnd ->SetLabel("Ends with");
-    fMitNampBeg ->SetLabel("Begins with");
-    fMitNampCon ->SetLabel("Contains");
+    fChkText    ->ResizeLocalized(B_TRANSLATE("Text Files Only"));
+    fChkRecu    ->ResizeLocalized(B_TRANSLATE("Recursive"));
+    fMfdSdir    ->ResizeLocalized(B_TRANSLATE("Search In:"));
+    fMitSdirOth ->SetLabel(B_TRANSLATE("Other…"));
+    fMfdNamp    ->ResizeLocalized(B_TRANSLATE("File Name:"));
+    fMitNampAny ->SetLabel(B_TRANSLATE("Any"));
+    fMitNampEnd ->SetLabel(B_TRANSLATE("Ends with"));
+    fMitNampBeg ->SetLabel(B_TRANSLATE("Begins with"));
+    fMitNampCon ->SetLabel(B_TRANSLATE("Contains"));
     fEdiName    ->ResizeLocalized();
 
     // Hack: Somehow the Label isn't set (SetLabelFromMarked()) if we don't do this
@@ -529 +529 @@
 
                 if (cmd == msg_ReplaceAll)
                 {
-                    switch (MAlert("Replace All on multiple files", "Cancel", "Leave Open", "Save To Disk").Go())
+                    switch (MAlert(
+                      B_TRANSLATE("Replace All on multiple"
+                      " files"), B_TRANSLATE("Cancel"),
+                      B_TRANSLATE("Leave Open"),
+                      B_TRANSLATE("Save To Disk")).Go())
                     {
                         case 1: return;
                         case 2: all = mrLeaveOpen; break;
@@ -1021 +1025 @@
         fDirNameStack.push(strdup(dir));
     }
 
-    if (!fCurrentDir) THROW(("Directory not found: %s", dir));
+    if (!fCurrentDir) THROW((B_TRANSLATE("Directory not found: %s"), dir));
 
     struct dirent *dent;
     struct stat stbuf;
@@ -1301 +1305 @@
         if (w && *w)
             m = static_cast<PMessageWindow*>(*w);
         else
-            m = new PMessageWindow("Search Results");
+            m = new PMessageWindow(B_TRANSLATE("Search Results"));
 
         BAutolock lock(m);
 

Sources/CGoToLine.cpp

@@ -33 +33 @@
     Created: 10/10/97 20:44:22
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "PDoc.h"
 #include "PText.h"
 #include "CGoToLine.h"
 #include "PMessages.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Go To Line"
+
 CGoToLine::CGoToLine(BRect frame, const char *name, window_type type, int flags,
     BWindow *owner)
     : HDialog(frame, name, type, flags | B_NOT_RESIZABLE, owner)
@@ -77 +82 @@
 
 void CGoToLine::Layout(void)
 {
-    fLine->ResizeLocalized("Line:");
-    fCancelButton->ResizeLocalized("Cancel");
-    fOkButton->ResizeLocalized("Ok");
+    fLine->ResizeLocalized(B_TRANSLATE("Line:"));
+    fCancelButton->ResizeLocalized(B_TRANSLATE("Cancel"));
+    fOkButton->ResizeLocalized(B_TRANSLATE("Ok"));
 
-    float div = fLine->StringWidth("Line:")+20;
+    float div = fLine->StringWidth(B_TRANSLATE("Line:"))+20;
     fLine->SetDivider(div);
     fLine->SetWidth(div+fLine->TextView()->StringWidth("1234567")+10);
 

Sources/CPathsBox.cpp

@@ -33 +33 @@
     Created: 10/20/97 21:53:02
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CListBox.h"
 #include "CPathsBox.h"
@@ -43 +45 @@
 #include "HDefines.h"
 #include "HPreferences.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Paths Box"
+
     typedef BListItem CListItem;
     typedef BView LView;
 
@@ -188 +193 @@
                     BStringItem *item;
                     FailOSErr(msg->FindPointer("item", (void**)&item));
                     if (fList->IndexOf(item) < 0)
-                        THROW(("item was removed from list!"));
+                        THROW((B_TRANSLATE("item was removed from list!")));
                     item->SetText(p.Path());
                 }
                 
@@ -218 +223 @@
         NULL, B_DIRECTORY_NODE, false, new BMessage(msg_AddPath));
     FailNil(fPanel);
     
-    fPanel->Window()->SetTitle("Add Directory");
+    fPanel->Window()->SetTitle(B_TRANSLATE("Add Directory"));
     fPanel->Show();
 } /* CPathsBox::AddClicked */
 
@@ -243 +248 @@
         &ref, B_DIRECTORY_NODE, false, msg);
     FailNil(fPanel);
     
-    fPanel->Window()->SetTitle("Change Directory");
+    fPanel->Window()->SetTitle(B_TRANSLATE("Change Directory"));
     fPanel->Show();
 } /* CPathsBox::ChangeClicked */
 

Sources/CHtmlBar.cpp

@@ -33 +33 @@
     Created: 03/09/98 23:14:35
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CHtmlBar.h"
 #include "PApp.h"
@@ -46 +48 @@
 #include "ResourcesMisc.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Html Bar"
+
 CHtmlBar *CHtmlBar::sfInstance;
 
 CHtmlBar* CHtmlBar::Instance()
@@ -70 +75 @@
 
 CHtmlBar::CHtmlBar()
     : BWindow(gPrefs->GetPrefRect(prf_R_HtmlPalettePos, BRect(20, 20, 120, 120)),
-        "HTML Palette",
+        B_TRANSLATE("HTML Palette"),
         B_FLOATING_WINDOW,
         B_AVOID_FRONT | B_AVOID_FOCUS | B_WILL_ACCEPT_FIRST_CLICK | B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
@@ -91 +96 @@
             
             size_t size;
             p = r.FindResource(rtyp_Htmp, (int32)rid_Htmp_HtmlPalette, &size);
-            if (p == NULL) THROW(("The custom HTML Palette file does not contain a valid palette resource"));
+            if (p == NULL) THROW((B_TRANSLATE("The custom HTML Palette file does not contain a valid palette resource")));
         }
         catch (HErr& e)
         {
@@ -102 +107 @@
     else
         p = HResources::GetResource(rtyp_Htmp, rid_Htmp_HtmlPalette, size);
     
-    if (p == NULL) THROW(("Could not find a palette resource"));
+    if (p == NULL) THROW((B_TRANSLATE("Could not find a palette resource")));
     
     BMemoryIO data(p, size);
     BPositionIO& buf = data;

Sources/PApp.cpp

@@ -37 +37 @@
 
 static const char *rcsid = "$Id$";
 
+#include <Catalog.h>
+
 #include "PApp.h"
 #include "PDoc.h"
 #include "PMessages.h"
@@ -63 +65 @@
 #include "CProjectRoster.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P App"
+
 BDirectory gAppDir, gCWD, gPrefsDir;
 BFile gAppFile;
 PApp *gApp;
@@ -137 +142 @@
     : BApplication("application/x-vnd.beunited.pe")
 {
 #if BETA
-    MInfoAlert a("This is a beta release of Pe.\n");
+    MInfoAlert a(B_TRANSLATE("This is a beta release of Pe.\n"));
     a.Go();
 #endif
 
@@ -150 +155 @@
             FailOSErr(find_directory(B_USER_SETTINGS_DIRECTORY, &settings, true));
 
             BDirectory e;
-            FailOSErrMsg(e.SetTo(settings.Path()), "~/config/settings directory not found ?!?!?");
+            FailOSErrMsg(e.SetTo(settings.Path()), B_TRANSLATE("~/config/settings directory not found ?!?!?"));
             if (!e.Contains("pe", B_DIRECTORY_NODE))
                 FailOSErr(e.CreateDirectory("pe", &gPrefsDir));
             else
@@ -264 +269 @@
         gRecentBufferSize = gPrefs->GetPrefInt(prf_I_RecentSize, 10);
         RestoreRecentMenu();
 
-        fFindDialog = DialogCreator<CFindDialog>::CreateDialog("Find", NULL, PDoc::TopWindow());
+        fFindDialog = DialogCreator<CFindDialog>::CreateDialog(B_TRANSLATE("Find"), NULL, PDoc::TopWindow());
         fFindDialog->Run();
 
         InitSelectedMap();
@@ -555 +560 @@
 
 static void Usage()
 {
-    fprintf(stderr, "Usage: pe [\"+\"linenr] file1 file2 ...\n");
+    fprintf(stderr, B_TRANSLATE("Usage: pe [\"+\"linenr] file1 file2 ...\n"));
 } /* Usage */
 
 void PApp::ArgvReceived(int32 argc, const char *argv[], const char * cwd)
@@ -796 +801 @@
             case msg_FindDifferences:
             {
                 BRect r(100,100,500,250);
-                new CDiffWindow(r, "Differences");
+                new CDiffWindow(r, B_TRANSLATE("Differences"));
                 break;
             }
 
@@ -935 +940 @@
                 if (fPrefsDialog) {
                     BAutolock lock(fPrefsDialog);
                     if (!lock.IsLocked()) {
-                        THROW(("Preferences panel failed to lock"));
+                        THROW((B_TRANSLATE("Preferences panel failed to lock")));
                         break;
                     }
 
@@ -951 +956 @@
                     fPrefsDialog->Activate(true);
                 }
                 else
-                    THROW(("Preferences panel failed to open"));
+                    THROW((B_TRANSLATE("Preferences panel failed to open")));
                 break;
             }
 
@@ -1039 +1044 @@
             be_roster->ActivateApp(team);
         }
         else if (be_roster->Launch(sig, &msg))
-            THROW(("Could not launch browser"));
+            THROW((B_TRANSLATE("Could not launch browser")));
     }
     catch (HErr& e)
     {

Sources/CPrefsDialog.cpp

@@ -34 +34 @@
     Created: 10/20/97 20:28:28
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CPrefsDialog.h"
 #include "PMessages.h"
@@ -60 +62 @@
 #include "Prefs.h"
 #include "PrefControls.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Prefs Dialog"
+
 typedef BStringItem CStringItem;
 
 class MyItem : public CStringItem
@@ -234 +239 @@
     BButton *ok = static_cast<BButton*>(FindView("ok  "));
     if (ok->IsEnabled())
     {
-        MWarningAlert a("The preferences have changed. Save changes before closing?", "Save", "Discard");
+        MWarningAlert a(B_TRANSLATE("The preferences have changed. Save changes before closing?"), B_TRANSLATE("Save"), B_TRANSLATE("Discard"));
         if (a == 1)
             OkClicked();
         else
@@ -392 +397 @@
         intf->SetExtensions(fSuffixes[cookie - 1].c_str());
 
     item = fDefLanguage->FindMarked();
-    gPrefs->SetPrefString(prf_S_DefLang, item ? item->Label() : "None");
+    gPrefs->SetPrefString(prf_S_DefLang, item ? item->Label() : B_TRANSLATE("None"));
     CLanguageInterface::ChooseDefault();
 
 
@@ -608 +613 @@
 
     CLanguageInterface *intf;
     int cookie = 0, i = 0;
-    const char *defLang = gPrefs->GetPrefString(prf_S_DefLang, "None");
+    const char *defLang = gPrefs->GetPrefString(prf_S_DefLang, B_TRANSLATE("None"));
 
     while ((intf = CLanguageInterface::NextIntf(cookie)) != NULL)
     {
@@ -963 +968 @@
         keymap::iterator ki = fKeymap.find(ks);
         if (ki != fKeymap.end() && (*ki).second != mi->fOne)
         {
-            MInfoAlert a("Do you want to replace the current binding for this shortcut?",
-                "Replace", "Cancel");
+            MInfoAlert a(B_TRANSLATE("Do you want to replace the current binding for this shortcut?"),
+                B_TRANSLATE("Replace"), B_TRANSLATE("Cancel"));
             if (a.Go() != 1)
                 return;
         }

Sources/CDiffWindow.cpp

@@ -50 +50 @@
 #include "ResourcesToolbars.h"
 #include "Prefs.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Diff Window"
+
 inline int compare(const char *a, const char *b)
 {
     return strcmp(a, b);
@@ -87 +92 @@
         pt.x = FindView("ButtonBar")->Frame().right + 10;
         pt.y = fh.ascent - 1;
         
-        strcpy(s, "File 1: ");
+        strcpy(s, B_TRANSLATE_WITH_COMMENT("File 1: ", 
+                "There is a space after the colon."));
         if (e.SetTo(&dw->File1(), true) == B_OK && e.Exists())
         {
             e.GetPath(&p);
             strcat(s, p.Path());
         }
         else
-            strcat(s, "<none>");
+            strcat(s, B_TRANSLATE("<none>"));
         
         DrawString(s, pt);
         
-        strcpy(s, "File 2: ");
+        strcpy(s, B_TRANSLATE_WITH_COMMENT("File 2: ",
+                "There is a space after the colon."));
         if (e.SetTo(&dw->File2(), true) == B_OK && e.Exists())
         {
             e.GetPath(&p);
             strcat(s, p.Path());
         }
         else
-            strcat(s, "<none>");
+            strcat(s, B_TRANSLATE("<none>"));
         
         pt.y += fh.ascent + fh.descent - 1;
         DrawString(s, pt);
@@ -308 +315 @@
                     msg->AddInt32("filenr", fileNr);
                     
                     fPanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), &ref, B_ANY_NODE, false, msg);
-                    fPanel->SetButtonLabel(B_DEFAULT_BUTTON, "Choose");
+                    fPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Choose"));
                     fPanel->Show();
                 }
                 fButtonBar->SetDown(cmd, false);
@@ -321 +328 @@
         while (system_time() < longEnough);
     }
 
-    BPopUpMenu popup("Recent");
+    BPopUpMenu popup(B_TRANSLATE("Recent"));
     BMenuItem *item;
     char s[PATH_MAX];
     int i = 0;
@@ -332 +339 @@
     popup.SetFont(be_plain_font);
     
     if (popup.CountItems() == 0)
-        popup.AddItem(new BMenuItem("Empty", NULL));
+        popup.AddItem(new BMenuItem(B_TRANSLATE("Empty"), NULL));
 
     BRect r;
     
@@ -359 +366 @@
         PDoc *docA, *docB;
         
         docA = dynamic_cast<PDoc*>(gApp->OpenWindow(fFile1));
-        if (! docA) THROW(("Could not open file 1"));
+        if (! docA) THROW((B_TRANSLATE("Could not open file 1")));
         docB = dynamic_cast<PDoc*>(gApp->OpenWindow(fFile2));
-        if (! docB) THROW(("Could not open file 2"));
+        if (! docB) THROW((B_TRANSLATE("Could not open file 2")));
         
         vector<int> va, vb;
         
@@ -391 +398 @@
         
         if (fScript->CountItems() == 0)
         {
-            MInfoAlert a("Files are identical");
+            MInfoAlert a(B_TRANSLATE("Files are identical"));
             a.Go();
             return;
         }
@@ -525 +532 @@
     FailOSErr(BEntry(&file, true).GetPath(&p));
     
     FILE *f = fopen(p.Path(), "r");
-    if (!f) THROW(("Failed to open file %s", p.Path()));
+    if (!f) THROW((B_TRANSLATE("Failed to open file %s"), p.Path()));
 
     char *txt;
     size_t size;
@@ -655 +662 @@
 
                 BRect r(100,100,500,250);
                         
-                CDiffWindow *ndw = new CDiffWindow(r, "Differences");
+                CDiffWindow *ndw = new CDiffWindow(r, B_TRANSLATE("Differences"));
                 
                 BMessage msg(msg_Add2Files);
                 msg.AddRef("refs", &f1);
@@ -821 +828 @@
     if (fA1 == fA2)
     {
         if (fB1 < fB2 - 1)
-            sprintf(s, "Extra lines in file 2: %d-%d", fB1 + 1, fB2);
+            sprintf(s, B_TRANSLATE("Extra lines in file 2: %d-%d"),
+                fB1 + 1, fB2);
         else
-            sprintf(s, "Extra line in file 2: %d", fB1 + 1);
+            sprintf(s, B_TRANSLATE("Extra line in file 2: %d"),
+                fB1 + 1);
     }
     else if (fB1 == fB2)
     {
         if (fA1 < fA2 - 1)
-            sprintf(s, "Extra lines in file 1: %d-%d", fA1 + 1, fA2);
+            sprintf(s, B_TRANSLATE("Extra lines in file 1: %d-%d"),
+                fA1 + 1, fA2);
         else
-            sprintf(s, "Extra line in file 1: %d", fA1 + 1);
+            sprintf(s, B_TRANSLATE("Extra line in file 1: %d"),
+                fA1 + 1);
     }
     else
     {
         if (fA1 < fA2 - 1 && fB1 < fB2 - 1)
-            sprintf(s, "Nonmatching lines. File 1: %d-%d, File2: %d-%d", fA1 + 1, fA2, fB1 + 1, fB2);
+            sprintf(s, B_TRANSLATE("Nonmatching lines. File 1: "
+              "%d-%d, File2: %d-%d"), fA1 + 1, fA2, fB1 + 1, fB2);
         else if (fB1 < fB2 - 1)
-            sprintf(s, "Nonmatching lines. File 1: %d, File2: %d-%d", fA1 + 1, fB1 + 1, fB2);
+            sprintf(s, B_TRANSLATE("Nonmatching lines. File 1: %d,"
+              " File2: %d-%d"), fA1 + 1, fB1 + 1, fB2);
         else if (fA1 < fA2 - 1)
-            sprintf(s, "Nonmatching lines. File 1: %d-%d, File2: %d", fA1 + 1, fA2, fB1 + 1);
+            sprintf(s, B_TRANSLATE("Nonmatching lines. File 1: "
+              "%d-%d, File2: %d"), fA1 + 1, fA2, fB1 + 1);
         else
-            sprintf(s, "Nonmatching lines. File 1: %d, File2: %d", fA1 + 1, fB1 + 1);
+            sprintf(s, B_TRANSLATE("Nonmatching lines. File 1: "
+              "%d, File2: %d"), fA1 + 1, fB1 + 1);
     }
     
     if (IsSelected())
@@ -872 +887 @@
     switch (fWhere)
     {
         case 0: strcpy(s, fFile); break;
-        case 1: sprintf(s, "File %s only in dir %d", fFile, 1); break;
-        case 2: sprintf(s, "File %s only in dir %d", fFile, 2); break;
+        case 1: sprintf(s, B_TRANSLATE("File %s only in dir %d"),
+          fFile, 1); break;
+        case 2: sprintf(s, B_TRANSLATE("File %s only in dir %d"),
+          fFile, 2); break;
     }
     
     if (IsSelected())
@@ -910 +927 @@
             docB = dynamic_cast<PDoc*>(gApp->OpenWindow(fFile2));
     }
 
-    if (! docA) THROW(("Could not open file 1"));
-    if (! docB) THROW(("Could not open file 2"));
+    if (! docA) THROW((B_TRANSLATE("Could not open file 1")));
+    if (! docB) THROW((B_TRANSLATE("Could not open file 2")));
 } // CDiffWindow::GetDocs

Sources/PText.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <signal.h>
 #include <PrintJob.h>
 #include <String.h>
@@ -68 +69 @@
 #include "ResourcesMenus.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Text"
+
 #if defined(__BEOS__) && defined(__INTEL__)
     // [zooey]: BeOS' glib is messing up iscntrl, as it reports all values>127 as
     // being control-chars, too (but they are *not*). We fix that:
@@ -1157 +1161 @@
 
 void PText::Insert(const char *bytes, int numBytes, int offset)
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     ASSERT(numBytes >= 0);
     ASSERT(offset >= 0);
@@ -1177 +1181 @@
 
 void PText::Delete(int from, int to)
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     ASSERT(from >= 0);
     ASSERT(to > from);
@@ -1196 +1200 @@
 
 void PText::BackspaceKeyDown()
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     if (fAnchor == fCaret)
     {
@@ -1242 +1246 @@
 
 void PText::DeleteKeyDown()
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     if (fAnchor == fCaret)
     {
@@ -1281 +1285 @@
 
 void PText::CharKeyDown(const char *bytes, int numBytes)
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     bool keepContext = OffsetIsOutsideOfContextArea(fCaret);
 
@@ -1352 +1356 @@
 
 void PText::TypeString(const char *string)
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     CharKeyDown(string, strlen(string));
     fStatus->SetOffset(fCaret);
@@ -1955 +1959 @@
 
             BMessage drag(B_SIMPLE_DATA);
             FailOSErr(drag.AddData("text/plain", B_MIME_DATA, s, strlen(s)));
-            FailOSErr(drag.AddString("be:clip_name", "Text Snippet"));
+            FailOSErr(drag.AddString("be:clip_name", B_TRANSLATE("Text Snippet")));
 
             fDragStart = min(fAnchor, fCaret);
             sfDragSource = this;
@@ -2217 +2221 @@
             {
                 BPopUpMenu popup("copy or move");
                 popup.SetFont(be_plain_font);
-                popup.AddItem(new BMenuItem("Move", NULL));
-                popup.AddItem(new BMenuItem("Copy", NULL));
+                popup.AddItem(new BMenuItem(B_TRANSLATE("Move"), NULL));
+                popup.AddItem(new BMenuItem(B_TRANSLATE("Copy"), NULL));
                 BMenuItem *item = popup.Go(msg->DropPoint(), false, true);
 
                 if (!item)
@@ -2469 +2473 @@
 
     if (includes.IsEmpty() && functions.IsEmpty())
     {
-        popup->AddItem(new BMenuItem("Nothing Found", NULL));
+        popup->AddItem(new BMenuItem(B_TRANSLATE("Nothing Found"), NULL));
     }
     else
     {
@@ -2551 +2555 @@
 
         BMenuItem* fontItem = fMainPopUp->FindItem(msg_ToggleFont);
         int fontKind = kAltFont;
-        // TODO: what about localized item names?!?
         switch (fFontKind) {
             case kNormalFont:
-                fontItem->SetLabel("Alternate Font");
+                fontItem->SetLabel(B_TRANSLATE("Alternate Font"));
                 fontItem->SetMarked(false);
                 fontKind = kAltFont;
                 break;
             case kAltFont:
-                fontItem->SetLabel("Alternate Font");
+                fontItem->SetLabel(B_TRANSLATE("Alternate Font"));
                 fontItem->SetMarked(true);
                 fontKind = kNormalFont;
                 break;
             case kIndividualFont:
             default:
-                fontItem->SetLabel("Individual Font");
+                fontItem->SetLabel(B_TRANSLATE("Individual Font"));
                 fontItem->SetMarked(true);
                 fontKind = kNormalFont;
                 break;
@@ -3407 +3410 @@
         switch (bytes[0])
         {
             case B_FUNCTION_KEY:
-                if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+                if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
                 key |= 0x0100;
 
@@ -3434 +3437 @@
 
             default:
             {
-                if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+                if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
                 if (gGlossary->IsGlossaryShortcut(ch, modifiers))
                 {
@@ -3802 +3805 @@
             RedrawDirtyLines();
             break;
         case kmsg_ExchangeMarkAndPoint:
-            if (fMark == -1) THROW(("Mark not set"));
+            if (fMark == -1) THROW((B_TRANSLATE("Mark not set")));
             newCaret = fMark;
             if (fAnchor != fCaret)
                 newAnchor = newCaret;
             SetMark(fCaret);
             break;
         case kmsg_CutRegion:
-            if (fMark == -1) THROW(("Mark not set"));
+            if (fMark == -1) THROW((B_TRANSLATE("Mark not set")));
             fAnchor = fMark;
             RegisterCommand(new PCutCmd(this));
             fMark = newCaret = newAnchor = fCaret;
             break;
         case kmsg_CopyRegion:
-            if (fMark == -1) THROW(("Mark not set"));
+            if (fMark == -1) THROW((B_TRANSLATE("Mark not set")));
             fAnchor = fMark;
             Copy();
             break;
         case kmsg_ClearRegion:
-            if (fMark == -1) THROW(("Mark not set"));
+            if (fMark == -1) THROW((B_TRANSLATE("Mark not set")));
             fAnchor = fMark;
             RegisterCommand(new PClearCmd(this));
             fMark = newCaret = newAnchor = fCaret;
@@ -4647 +4650 @@
 {
     if (fExec)
     {
-        MWarningAlert a("Can only execute one command at the time per window, sorry!");
+        MWarningAlert a(B_TRANSLATE("Can only execute one command at the time per window, sorry!"));
         a.Go();
         return;
     }
@@ -6028 +6031 @@
 
                 FailOSErr(msg->FindRef("refs", &ref));
                 FailOSErr(e.SetTo(&ref));
-                if (!e.IsDirectory()) THROW(("This is not a directory!"));
+                if (!e.IsDirectory()) THROW((B_TRANSLATE("This is not a directory!")));
 
                 BPath p;
                 FailOSErr(e.GetPath(&p));
@@ -6361 +6364 @@
 
 void PText::Cut(int append)
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     Copy(append);
     Clear();
@@ -6423 +6426 @@
 
 void PText::Paste()
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
     be_clipboard->Lock();
 
     try
@@ -6458 +6461 @@
 
 void PText::Clear()
 {
-    if (Doc()->IsReadOnly()) THROW(("Document is read-only"));
+    if (Doc()->IsReadOnly()) THROW((B_TRANSLATE("Document is read-only")));
 
     int size = abs(fCaret - fAnchor);
     if (size)
@@ -6511 +6514 @@
     if (fDoneCmds.size())
     {
         mbar->FindItem(msg_Undo)->SetEnabled(true);
-        char s[64] = "Undo ";
-        strcat(s, fDoneCmds.top()->Desc());
-        mbar->FindItem(msg_Undo)->SetLabel(s);
+        BString str1(B_TRANSLATE("Undo %1"));
+        str1.ReplaceFirst("%1", fDoneCmds.top()->Desc());
+        mbar->FindItem(msg_Undo)->SetLabel(str1.String());
     }
     else
         mbar->FindItem(msg_Undo)->SetEnabled(false);
@@ -6521 +6524 @@
     if (fUndoneCmds.size())
     {
         mbar->FindItem(msg_Redo)->SetEnabled(true);
-        char s[64] = "Redo ";
-        strcat(s, fUndoneCmds.top()->Desc());
-        mbar->FindItem(msg_Redo)->SetLabel(s);
+        BString str2(B_TRANSLATE("Redo %2"));
+        str2.ReplaceFirst("%2", fUndoneCmds.top()->Desc());
+        mbar->FindItem(msg_Redo)->SetLabel(str2.String());
     }
     else
         mbar->FindItem(msg_Redo)->SetEnabled(false);

Sources/CFtpStream.cpp

@@ -33 +33 @@
     Created: 03/31/98 14:29:11
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CFtpStream.h"
 #include "CLogin.h"
@@ -49 +51 @@
 #endif
 #include <netdb.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Ftp Stream"
+
 #ifndef __HAIKU__
 typedef int socklen_t;
 #endif
@@ -145 +150 @@
 URLData& URLData::operator+= (const char *relPath)
 {
     if (!IsValid())
-        THROW(("Url is not valid in the first place!"));
+        THROW((B_TRANSLATE("Url is not valid in the first place!")));
     
     if (strchr(relPath, '/') == NULL)
     {
@@ -180 +185 @@
 
 void URLData::PrintToStream()
 {
-    printf("URL:\n\tServer=%s,\n\tDirectory=%s,\n\tFile=%s,\n\tUsername=%s\n",
+    printf(B_TRANSLATE("URL:\n\tServer=%s,\n\tDirectory=%s,\n\tFile=%s,\n\tUsername=%s\n"),
         fServer, fPath, fFile, fUsername);
 } /* URLData::PrintToStream */
 
@@ -202 +207 @@
 static void GetReply(struct SOCK *sock, int& r, char* msg)
 {
     if (! s_gets(msg, 1024, sock))
-        THROW(("Read error"));
+        THROW((B_TRANSLATE("Read error")));
 
     char *m;
     r = strtoul(msg, &m, 10);
@@ -213 +218 @@
         do
         {
             if (! s_gets(msg, 1024, sock))
-                THROW(("Read error"));
+                THROW((B_TRANSLATE("Read error")));
             r2 = strtoul(msg, &m, 10);
         }
         while (m == NULL || r2 != r || *m != ' ');
@@ -222 +227 @@
 
 inline void FailSockErr(int e)
 {
-    if (e < 0) THROW(("Network error: %s", strerror(errno)));
+    if (e < 0) THROW((B_TRANSLATE("Network error: %s"), strerror(errno)));
 } /* FailSockErr */
 
 void CFtpStream::Retrieve()
@@ -244 +249 @@
     try
     {
         if (! fURL.IsValid())
-            THROW(("The data to connect is not complete"));
+            THROW((B_TRANSLATE("The data to connect is not complete")));
         
         ctrl = socket(AF_INET, SOCK_STREAM, 0);
         if (ctrl < 0)
-            THROW(("Failed to get socket: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get socket: %s"), strerror(errno)));
         data = socket(AF_INET, SOCK_STREAM, 0);
         if (data < 0)
-            THROW(("Failed to get socket: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get socket: %s"), strerror(errno)));
         
         csSock = s_open(ctrl, "r+");
         
         struct hostent *host;
         if ((host = gethostbyname(fURL.Server())) == NULL)
-            THROW(("Failed to get server address: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get server address: %s"), strerror(errno)));
         
         struct sockaddr_in sa;
         sa.sin_family = AF_INET;
@@ -291 +296 @@
             {
                 case 1:
                     if ((r / 100) != 2)
-                        THROW(("Connect failed: %s", msg));
-                    s_printf(csSock, "user %s\r\n", username.c_str());
+                        THROW((B_TRANSLATE("Connect failed: %s"), msg));
+                    s_printf(csSock, B_TRANSLATE("user %s\r\n"), username.c_str());
                     state = 2;
                     break;
                 
                 case 2:
                     if ((r / 100) == 3)
                     {
-                        s_printf(csSock, "pass %s\r\n", password.c_str());
+                        s_printf(csSock, B_TRANSLATE("pass %s\r\n"), password.c_str());
                         state = 3;
                         break;
                     }
                     else if ((r / 100) != 2 && (r / 100) != 5)
-                        THROW(("Failed to login: %s", msg));
+                        THROW((B_TRANSLATE("Failed to login: %s"), msg));
 
                     // fall thru
                 
@@ -328 +333 @@
                             THROW((0));
                     }
                     else if (state == 3 && (r / 100) != 2)
-                        THROW(("Failed to login: %s", msg));
+                        THROW((B_TRANSLATE("Failed to login: %s"), msg));
                     else if (strlen(fURL.Path()))
                     {
                         s_printf(csSock, "cwd %s\r\n", fURL.Path());
@@ -341 +346 @@
                 case 4:
                 {
                     if (state == 4 && (r / 100) != 2)
-                        THROW(("Failed to change directory: %s", msg));
+                        THROW((B_TRANSLATE("Failed to change directory: %s"), msg));
                     
                     if (fPassive) {
                         // switch to passive mode
@@ -364 +369 @@
                         // fetch ip-address from cmd-socket:
                         FailSockErr(getsockname(csSock->sSocket, (struct sockaddr *)&sa, &size));
                         unsigned char *sap = (unsigned char *)&sa.sin_addr.s_addr;
-                        s_printf(csSock, "port %d,%d,%d,%d,%d,%d\r\n", sap[0], sap[1], sap[2], sap[3], pap[0], pap[1]);
+                        s_printf(csSock, B_TRANSLATE("port %d,%d,%d,%d,%d,%d\r\n"), sap[0], sap[1], sap[2], sap[3], pap[0], pap[1]);
                     }
                     state = 5;
                     break;
@@ -374 +379 @@
                         unsigned int sap[4];
                         unsigned int pap[2];
                         if ((r / 100) != 2)
-                            THROW(("Pasv command failed: %s", msg));
+                            THROW((B_TRANSLATE("Pasv command failed: %s"), msg));
                         char* pos = strchr(msg,'(');
                         if (!pos)
-                            THROW(("Answer to Pasv has unknown format: %s", msg));
+                            THROW((B_TRANSLATE("Answer to Pasv has unknown format: %s"), msg));
                         int cnt = sscanf(pos+1, "%u,%u,%u,%u,%u,%u", 
                                               &sap[0], &sap[1], &sap[2], &sap[3], 
                                               &pap[0], &pap[1]);
                         if (cnt != 6)
-                            THROW(("Could not parse answer to Pasv (%d of 6): %s", 
+                            THROW((B_TRANSLATE("Could not parse answer to Pasv (%d of 6): %s"), 
                                      cnt, msg));
                         char ipAddr[20];
                         sprintf(ipAddr, "%d.%d.%d.%d", sap[0], sap[1], sap[2], sap[3]);
@@ -391 +396 @@
                         FailOSErr(connect(data, (struct sockaddr *)&saData, sizeof(saData)));
                     } else {
                         if ((r / 100) != 2)
-                            THROW(("Port command failed: %s", msg));
+                            THROW((B_TRANSLATE("Port command failed: %s"), msg));
                     }
                     if (action == 1)
                     {
@@ -436 +441 @@
                         state = 8;
                     }
                     else
-                        THROW(("Failed to retrieve file: %s", msg));
+                        THROW((B_TRANSLATE("Failed to retrieve file: %s"), msg));
                     break;
                     
                 case 7:
@@ -463 +468 @@
                         state = 8;
                     }
                     else
-                        THROW(("Failed to store file: %s", msg));
+                        THROW((B_TRANSLATE("Failed to store file: %s"), msg));
                     break;
 
                 case 8:
                     if ((r / 100) != 2)
-                        THROW(("Failed to %s file: %s", action == 1 ? "retrieve" : "store",  msg));
-                    s_printf(csSock, "quit\r\n");
+                      if (action == 1)
+                        THROW((B_TRANSLATE("Failed to retrieve file: %s"), msg));
+                      else
+                        THROW((B_TRANSLATE("Failed to store file: %s"), msg));
+                    s_printf(csSock, THROW(B_TRANSLATE("quit\r\n")));
                     state = 0;
                     break;
 

Sources/CInfoDialog.cpp

@@ -33 +33 @@
     Created: 10/28/97 09:19:58
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "CInfoDialog.h"
 #include "PMessages.h"
@@ -47 +49 @@
 #include "MAlert.h"
 #include "Prefs.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Info Dialog"
+
 CInfoDialog::CInfoDialog(BRect frame, const char *name, window_type type, int flags,
             BWindow *owner, BPositionIO* data)
     : HDialog(frame, name, type, flags, owner, data)
@@ -100 +105 @@
     {
         BMenuItem *item;
         fTypes->AddSeparatorItem();
-        fTypes->AddItem(item = new BMenuItem("<undefined>", new BMessage(msg_FieldChanged)));
+        fTypes->AddItem(item = new BMenuItem(B_TRANSLATE("<undefined>"), new BMessage(msg_FieldChanged)));
         item->SetMarked(true);
     }
 
@@ -121 +126 @@
     else
     {
         //SetEnabled("mime", false);
-        SetText("time", "Not Saved");
+        SetText("time", B_TRANSLATE("Not Saved"));
     }
 
     mf = dynamic_cast<BMenuField*>(FindView("font"));
@@ -311 +316 @@
 
     if (strcmp(fTypes->FindMarked()->Label(), "undefined") == 0)
     {
-        MWarningAlert a("Please choose a real mime type");
+        MWarningAlert a(B_TRANSLATE("Please choose a real mime type"));
         a.Go();
     }
 

Sources/PDoc.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
+
 #include <fs_attr.h>
 
 #include "CCharObject.h"
@@ -77 +79 @@
 #include "Scripting.h"
 #include "Utils.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Doc"
+
 static long sDocCount = 0;
 
 const float
@@ -91 +96 @@
     fWindowMenuLength = -1;
     fToolBar = NULL;
 
-    InitWindow(doc ? doc->name : "Untitled");
+    InitWindow(doc ? doc->name : B_TRANSLATE("Untitled"));
 
     if (IsReadOnly())
         fButtonBar->SetOn(msg_ReadOnly, true);
@@ -131 +136 @@
     fWindowMenuLength = -1;
     fToolBar = NULL;
 
-    InitWindow("Untitled");
+    InitWindow(B_TRANSLATE("Untitled"));
 
     Read();
 
@@ -207 +212 @@
         i++;
     }
 
-    if (!fRecent) THROW(("Resources damaged?"));
+    if (!fRecent) THROW((B_TRANSLATE("Resources damaged?")));
 
     b.top += fMBar->Frame().bottom + 1;
     r = b;
@@ -348 +353 @@
         return;
     if (IsDirty())
     {
-        MInfoAlert a(
+        MInfoAlert a(B_TRANSLATE(
             "This will re-read the document's contents from disk,\n"
             "so all changes will be lost!\n\n"
-            "Do you want to continue?", "OK", "Cancel");
+            "Do you want to continue?"), B_TRANSLATE("OK"),
+            B_TRANSLATE("Cancel"));
         if (a.Go() != 1)
             return;
     }
@@ -441 +447 @@
             BMenuItem *item = m->FindMarked();
             FailNil(item);
 
-            if (strcmp(item->Label(), "<undefined>"))
+            if (strcmp(item->Label(), B_TRANSLATE("<undefined>")))
             {
                 gPrefs->SetPrefInt("LastSavedMimeType", m->IndexOf(item));
                 SetMimeType(item->Label(), false);
@@ -874 +880 @@
     if (lock.IsLocked())
     {
         BView *background = savePanel->ChildAt(0);
-        FailNilMsg(background, "Error building FilePanel");
+        FailNilMsg(background, B_TRANSLATE("Error building FilePanel"));
 
         BButton *cancel = dynamic_cast<BButton*>(background->FindView("cancel button"));
-        FailNilMsg(cancel, "Error building FilePanel");
+        FailNilMsg(cancel, B_TRANSLATE("Error building FilePanel"));
 
         BView *textview = background->FindView("text view");
-        FailNilMsg(textview, "Error building FilePanel");
+        FailNilMsg(textview, B_TRANSLATE("Error building FilePanel"));
 
         BMenu *menu = HResources::GetMenu(rid_Menu_FpMimetypes, true);
-        FailNilMsg(menu, "Error building FilePanel");
+        FailNilMsg(menu, B_TRANSLATE("Error building FilePanel"));
         menu->SetFont(be_plain_font);
         menu->SetRadioMode(true);
 
@@ -893 +899 @@
         be_plain_font->GetHeight(&fh);
         rect.bottom = rect.top + fh.descent + fh.ascent + 5.0;
 
-        BMenuField *menuField = new BMenuField(rect, "mime", "Type:",
+        BMenuField *menuField = new BMenuField(rect, "mime", B_TRANSLATE("Type:"),
             menu, B_FOLLOW_BOTTOM | B_FOLLOW_LEFT);
-        FailNilMsg(menuField, "Error building FilePanel");
-        menuField->SetDivider(be_plain_font->StringWidth("Type:") + 7);
+        FailNilMsg(menuField, B_TRANSLATE("Error building FilePanel"));
+        menuField->SetDivider(be_plain_font->StringWidth(B_TRANSLATE("Type:")) + 7);
         menuField->MenuBar()->ResizeToPreferred();
         menuField->ResizeToPreferred();
 
@@ -946 +952 @@
         {
             p = MimeType();
             if (!p || !p[0])
-                p = "<undefined>";
+                p = B_TRANSLATE("<undefined>");
             menu->AddItem(item = new BMenuItem(p, NULL));
             item->SetMarked(true);
         }
@@ -1194 +1200 @@
             return;
         }
     }
-    THROW(("Extension %s not found!", ext));
+    THROW((B_TRANSLATE("Extension %s not found!"), ext));
 } /* PDoc::PerformExtension */
 
 void PDoc::InstantiateAddOns()
@@ -1399 +1405 @@
                     MAlert *a;
 
                     if (URL())
-                        a  = new MInfoAlert("In order to display this page in a browser you need to "
+                        a  = new MInfoAlert(B_TRANSLATE("In order to display this page in a browser you need to "
                         "save this document on a local disk first.\n\n"
-                        "Save changes to this document first?", "Save", "Cancel");
+                        "Save changes to this document first?"), B_TRANSLATE("Save"), B_TRANSLATE("Cancel"));
                     else
-                        a = new MInfoAlert("Save changes to this document first?", "Save", "Cancel");
+                        a = new MInfoAlert(B_TRANSLATE("Save changes to this document first?"), B_TRANSLATE("Save"), B_TRANSLATE("Cancel"));
 
                     if (a->Go() == 1)
                     {
@@ -1436 +1442 @@
 
             case msg_GoToLine:
             {
-                DialogCreator<CGoToLine>::CreateDialog("Go To Line", this);
+                DialogCreator<CGoToLine>::CreateDialog(B_TRANSLATE("Go To Line"), this);
                 break;
             }
 
@@ -1540 +1546 @@
                 r.right = r.left + 400;
                 r.bottom = r.top + 150;
 
-                new CDiffWindow(r, "Differences");
+                new CDiffWindow(r, B_TRANSLATE("Differences"));
                 break;
             }
 
@@ -1574 +1580 @@
                 }
                 else
                 {
-                    MInfoAlert a(prjWin->ErrorMsg(), "Hmmm...");
+                    MInfoAlert a(prjWin->ErrorMsg(), B_TRANSLATE("Hmmm..."));
                     a.Go();
                 }
                 break;
@@ -1834 +1840 @@
         while (system_time() < longEnough);
     }
 
-    BPopUpMenu popup("Recent");
+    BPopUpMenu popup(B_TRANSLATE("Recent"));
     BMenuItem *item;
 
     MenusBeginning();
@@ -1849 +1855 @@
     popup.SetFont(be_plain_font);
 
     if (popup.CountItems() == 0)
-        popup.AddItem(new BMenuItem("Empty", NULL));
+        popup.AddItem(new BMenuItem(B_TRANSLATE("Empty"), NULL));
 
     BRect r;
 
@@ -1867 +1873 @@
 {
     entry_ref ide;
     if (be_roster->FindApp("application/x-mw-BeIDE", &ide))
-        THROW(("BeIDE was not found"));
+        THROW((B_TRANSLATE("BeIDE was not found")));
 
     if (be_roster->IsRunning(&ide))
         be_roster->ActivateApp(be_roster->TeamFor(&ide));
     else if (be_roster->Launch(&ide) != B_OK)
-        THROW(("Could not launch BeIDE"));
+        THROW((B_TRANSLATE("Could not launch BeIDE")));
 } /* PDoc::IDEBringToFront */
 
 void PDoc::IDEAddFile()
@@ -1891 +1897 @@
     IDEBringToFront();
     SendToIDE(msg, &reply);
     if (reply.HasInt32("error"))
-        THROW(("An error occured adding the file"));
+        THROW((B_TRANSLATE("An error occured adding the file")));
 } /* PDoc::IDEAddFile */
 
 void PDoc::IDERemoveFile()
@@ -1910 +1916 @@
     IDEBringToFront();
     SendToIDE(msg, &reply);
     if (reply.HasInt32("error"))
-        THROW(("An error occured removing the file"));
+        THROW((B_TRANSLATE("An error occured removing the file")));
 } /* PDoc::IDERemoveFile */
 
 void PDoc::IDEMake()
@@ -1925 +1931 @@
 
     entry_ref ide;
     if (be_roster->FindApp("application/x-mw-BeIDE", &ide))
-        THROW(("BeIDE was not found"));
+        THROW((B_TRANSLATE("BeIDE was not found")));
 
     if (be_roster->IsRunning(&ide))
     {
@@ -1933 +1939 @@
         msgr.SendMessage(&msg);
     }
     else
-        THROW(("BeIDE is not running"));
+        THROW((B_TRANSLATE("BeIDE is not running")));
 } /* PDoc::IDEMake */
 
 void PDoc::IDEProject2Group()
@@ -1949 +1955 @@
     SendToIDE(msg, &reply);
 
     if (reply.HasInt32("error"))
-        THROW(("An error occured while retrieving the project files"));
+        THROW((B_TRANSLATE("An error occured while retrieving the project files")));
     else
     {
         PGroupWindow *gw = new PGroupWindow;
@@ -1976 +1982 @@
 } /* PDoc::IDEProject2Group */
 
 const long cmd_AndyFeature = 4000;
-const char kFileName[] = "File", kTextFileRef[] = "TextRef";
+const char kFileName[] = B_TRANSLATE("File"), kTextFileRef[] = B_TRANSLATE("TextRef");
 
 /* [zooey]: deactivated, see my comment in OpenPartner()
 bool PDoc::IDEOpenSourceHeader(entry_ref& ref)

Sources/PItalicMenuItem.cpp

@@ -34 +34 @@
 #include "pe.h"
 #include "PItalicMenuItem.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Italic Menu Item"
+
 PItalicMenuItem::PItalicMenuItem(const char *label, BMessage *message, char shortcut, uint32 modifiers)
     : BMenuItem(label, message, shortcut, modifiers)
 {
@@ -48 +51 @@
     font_family ff;
     font_style fs;
     font.GetFamilyAndStyle(&ff, &fs);
-    font.SetFamilyAndStyle(ff, "Italic");
+    font.SetFamilyAndStyle(ff, B_TRANSLATE("Italic"));
     
     Menu()->SetFont(&font);
     

Sources/Utils.cpp

@@ -36 +36 @@
 #include "Utils.h"
 #include "HError.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Utils"
+
 //uchar gSelectedMap[256];
 //
 //void InitSelectedMap()
@@ -94 +99 @@
     
     if (!valid)
     {
-        puts("Invalid region:");
+        puts(B_TRANSLATE("Invalid region:"));
         rgn.PrintToStream();
 
         FILE *f = fopen("pe.log", "w");
@@ -104 +109 @@
         time_t t;
         time(&t);
 
-        fprintf(f, "---\ndate: %sInvalid region in pe:\n", ctime(&t));
+        fprintf(f, B_TRANSLATE("---\ndate: %sInvalid region in pe:\n"), ctime(&t));
         
         BRect b = rgn.Frame();
-        
-        fprintf(f, "Frame(%s): %g, %g, %g, %g\n", b.IsValid() ? "valid" : "invalid",
-            b.left, b.top, b.right, b.bottom);
 
+        if (b.IsValid())
+          fprintf(f, B_TRANSLATE("Frame(valid): %g, %g, %g, %g\n"), b.left, b.top, b.right, b.bottom);
+        else
+          fprintf(f, B_TRANSLATE("Frame(invalid): %g, %g, %g, %g\n"), b.left, b.top, b.right, b.bottom);
+
         int i;
         
         for (i = 0; i < rgn.CountRects(); i++)
         {
             b = rgn.RectAt(i);
-            fprintf(f, "Frame(%s): %g, %g, %g, %g\n", b.IsValid() ? "valid" : "invalid",
-                b.left, b.top, b.right, b.bottom);
+            if (b.IsValid())
+              fprintf(f, B_TRANSLATE("Frame(valid): %g, %g, %g, %g\n"), b.left, b.top, b.right, b.bottom);
+            else
+              fprintf(f, B_TRANSLATE("Frame(invalid): %g, %g, %g, %g\n"), b.left, b.top, b.right, b.bottom);
+
         }
         
         if (rgn.Frame().IsValid())
-            fputs("Frame was valid", f);
+            fputs(B_TRANSLATE("Frame was valid"), f);
         else
         {
-            fputs("Frame Invalid", f);
+            fputs(B_TRANSLATE("Frame Invalid"), f);
             valid = true;
         }
         
@@ -146 +156 @@
     {
         // tracker is not running and we pass the message trough launching it
         if (be_roster->Launch(trackerSignature, &msg) < B_OK)
-            THROW(("Tracker not running???"));
+            THROW((B_TRANSLATE("Tracker not running???")));
     }
     else
     {
@@ -159 +169 @@
 {
     entry_ref ide;
     if (be_roster->FindApp("application/x-mw-BeIDE", &ide))
-        THROW(("BeIDE was not found"));
+        THROW((B_TRANSLATE("BeIDE was not found")));
 
     if (be_roster->IsRunning(&ide))
     {
@@ -167 +177 @@
         msgr.SendMessage(const_cast<BMessage*>(&msg), reply);
     }
     else
-        THROW(("BeIDE is not running"));    
+        THROW((B_TRANSLATE("BeIDE is not running")));   
 } /* SendToIDE */
 
 void RelativePath(const entry_ref& a, const entry_ref& b, char* path)

Sources/HError.h

@@ -38 +38 @@
 
 #include "HLibHekkel.h"
 
+#include <Catalog.h>
+
 #include <cerrno>
 #include <syslog.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Error"
+
 #if DEBUG
 #   define ASSERT_OR_THROW(x)       ASSERT(x); if (!(x)) throw HErr("Assertion failed at %s:%d: %s", __FILE__, __LINE__, #x)
 #else
 #   define ASSERT_OR_THROW(x)       if (!(x)) throw HErr("Assertion failed at %s:%d: %s", __FILE__, __LINE__, #x)
 #endif
 
-IMPEXP_LIBHEKKEL const char kDefaultMessage[] = "An OS error occurred: %s";
+IMPEXP_LIBHEKKEL const char kDefaultMessage[] = B_TRANSLATE("An OS error occurred: %s");
 
 class IMPEXP_LIBHEKKEL HErr
 {

Sources/HPreferences.cpp

@@ -38 +38 @@
 #include "HError.h"
 #include "Prefs.h"
 
+#include <Catalog.h>
+
 #define BLOCK       BAutolock lock(fLock); if (! lock.IsLocked()) return
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "h Preference"
+
 HPreferences *gPrefs = NULL;
 
 HPreferences::HPreferences(const char *preffilename)
@@ -320 +325 @@
     f = fopen(fFile, "w");
     
     if (!f)
-        throw HErr("Could not create settings file");
+        throw HErr(B_TRANSLATE("Could not create settings file"));
     
     PrefMap::iterator pi;
     

Sources/CFtpDialog.cpp

@@ -33 +33 @@
     Created: 11/14/98 13:50:36
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "PApp.h"
 #include "CFtpDialog.h"
@@ -56 +58 @@
 typedef int socklen_t;
 #endif
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Ftp Dialog"
+
 static string sfPassword;
 
 const unsigned long
@@ -202 +207 @@
 
 void CFtpDialog::Layout(void)
 {
-    fServerName->ResizeLocalized("Host:");
-    fUserName->ResizeLocalized("Username:");
-    fPassword->ResizeLocalized("Password:");
-    fUsePassive->ResizeLocalized("Passive Mode");
-    fConnectButton->ResizeLocalized("Connect");
-    fCancelButton->ResizeLocalized("Cancel");
-    fOkButton->ResizeLocalized("Open");
-    fShowDotted->ResizeLocalized("Show All!");
+    fServerName->ResizeLocalized(B_TRANSLATE("Host:"));
+    fUserName->ResizeLocalized(B_TRANSLATE("Username:"));
+    fPassword->ResizeLocalized(B_TRANSLATE("Password:"));
+    fUsePassive->ResizeLocalized(B_TRANSLATE("Passive Mode"));
+    fConnectButton->ResizeLocalized(B_TRANSLATE("Connect"));
+    fCancelButton->ResizeLocalized(B_TRANSLATE("Cancel"));
+    fOkButton->ResizeLocalized(B_TRANSLATE("Open"));
+    fShowDotted->ResizeLocalized(B_TRANSLATE("Show All!"));
     fDirectoryField->ResizeLocalized();
     fFileName->ResizeLocalized();
 
@@ -302 +307 @@
     else
         fFileName->SetText(name);
 
-    fOkButton->SetLabel("Save");
+    fOkButton->SetLabel(B_TRANSLATE("Save"));
 
-    SetTitle("Save on Server");
+    SetTitle(B_TRANSLATE("Save on Server"));
 } // CFtpDialog::MakeItSave
 
 bool CFtpDialog::OkClicked()
@@ -456 +461 @@
 void CFtpDialog::GetReply()
 {
     if (! s_gets(fReply, 1024, fSocketFD))
-        THROW(("Read error"));
+        THROW((B_TRANSLATE("Read error")));
 
     char *m;
     int r = strtoul(fReply, &m, 10);
@@ -467 +472 @@
         do
         {
             if (! s_gets(fReply, 1024, fSocketFD))
-                THROW(("Read error"));
+                THROW((B_TRANSLATE("Read error")));
             r2 = strtoul(fReply, &m, 10);
         }
         while (m == NULL || r2 != r || *m != ' ');
@@ -476 +481 @@
 
 inline void FailSockErr(int e)
 {
-    if (e < 0) THROW(("Network error: %s", strerror(errno)));
+    if (e < 0) THROW((B_TRANSLATE("Network error: %s"), strerror(errno)));
 } /* FailSockErr */
 
 void CFtpDialog::Connect()
@@ -491 +496 @@
 
         fSocket = socket(AF_INET, SOCK_STREAM, 0);
         if (fSocket < 0)
-            THROW(("Failed to get socket: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get socket: %s"),
+                   strerror(errno)));
 
         fSocketFD = s_open(fSocket, "r+");
         FailNil(fSocketFD);
@@ -500 +506 @@
 
         struct hostent *host;
         if ((host = gethostbyname(GetText("srvr"))) == NULL)
-            THROW(("Failed to get server address: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get server address: %s"),
+                   strerror(errno)));
 
         struct sockaddr_in sa;
         sa.sin_family = AF_INET;
@@ -518 +525 @@
             {
                 case 1:
                     if (*fReply != '2')
-                        THROW(("Connect failed: %s", fReply));
+                        THROW((
+                        B_TRANSLATE("Connect failed: %s"), fReply));
                     s_printf(fSocketFD, "user %s\r\n", GetText("user"));
                     state = 2;
                     break;
@@ -531 +539 @@
                         break;
                     }
                     else if (*fReply != '2' && *fReply != '5')
-                        THROW(("Failed to login: %s", fReply));
+                        THROW((
+                        B_TRANSLATE("Failed to login: %s"), fReply));
 
                     // fall thru
 
                 case 3:
                     if (*fReply == '5')
-                        THROW(("Incorrect username/password.\n%s", fReply));
+                        THROW((
+                        B_TRANSLATE("Incorrect username/password.\n%s"), fReply));
                     if (state == 3 && *fReply != '2')
-                        THROW(("Failed to login: %s", fReply));
+                        THROW((B_TRANSLATE("Failed to login: %s"), fReply));
 
                     state = 0;
                     break;
@@ -612 +622 @@
 
         data = socket(AF_INET, SOCK_STREAM, 0);
         if (data < 0)
-            THROW(("Failed to get socket: %s", strerror(errno)));
+            THROW((B_TRANSLATE("Failed to get socket: %s"),
+                   strerror(errno)));
 
         memset(&saData, 0, sizeof(saData));
         saData.sin_family = AF_INET;
@@ -642 +653 @@
                                             &size));
             unsigned char *sap = (unsigned char *)&saCmd.sin_addr.s_addr;
             // combine both into the PORT-command:
-            s_printf(fSocketFD, "port %d,%d,%d,%d,%d,%d\r\n", sap[0], sap[1], 
+            s_printf(fSocketFD, B_TRANSLATE("port %d,%d,%d,%d,%d,%d\r\n"), sap[0], sap[1], 
                         sap[2], sap[3], pap[0], pap[1]);
         }
 
@@ -660 +671 @@
                         unsigned int sap[4];
                         unsigned int pap[2];
                         if (*fReply != '2')
-                            THROW(("Pasv command failed: %s", fReply));
+                            THROW((B_TRANSLATE("Pasv command failed: %s"), fReply));
                         char* pos = strchr(fReply,'(');
                         if (!pos)
-                            THROW(("Answer to Pasv has unknown format: %s", fReply));
+                            THROW((B_TRANSLATE("Answer to Pasv has unknown format: %s"), fReply));
                         int cnt = sscanf(pos+1, "%u,%u,%u,%u,%u,%u", 
                                               &sap[0], &sap[1], &sap[2], &sap[3], 
                                               &pap[0], &pap[1]);
                         if (cnt != 6)
-                            THROW(("Could not parse answer to Pasv (%d of 6): %s", 
+                            THROW((B_TRANSLATE("Could not parse answer to Pasv (%d of 6): %s"), 
                                      cnt, fReply));
                         char ipAddr[20];
                         sprintf(ipAddr, "%d.%d.%d.%d", sap[0], sap[1], sap[2], sap[3]);
@@ -678 +689 @@
                         dsf = s_open(data, "r+");
                     } else {
                         if (*fReply != '2')
-                            THROW(("Port command failed: %s", fReply));
+                            THROW((B_TRANSLATE("Port command failed: %s"), fReply));
                     }
                     s_printf(fSocketFD, "list\r\n");
                     state = 2;
@@ -712 +723 @@
                                     delete item;
                             }
                             if (entryCount == 0)
-                                THROW(("Could not get listing."));
+                                THROW((B_TRANSLATE("Could not get listing.")));
 
                             fListView->Invalidate();
                             UpdateIfNeeded();
@@ -731 +742 @@
                         state = 3;
                     }
                     else
-                        THROW(("Failed to get listing: %s", fReply));
+                        THROW((B_TRANSLATE("Failed to get listing: %s"), fReply));
                     break;
 
                 case 3:
                     if (*fReply != '2')
-                        THROW(("Something went wrong fetching the directory listing"));
+                        THROW((B_TRANSLATE("Something went wrong fetching the directory listing")));
                     state = 0;
                     break;
             }
@@ -766 +777 @@
         GetReply();
 
         if (*fReply != '2')
-            THROW(("Changing directory failed.\n%s", fReply));
+            THROW((B_TRANSLATE("Changing directory failed.\n%s"), fReply));
 
         ListDirectory();
     }
@@ -793 +804 @@
         GetReply();
 
         if (*fReply != '2')
-            THROW(("Could not get current working directory.\n%s", fReply));
+            THROW((B_TRANSLATE("Could not get current working directory.\n%s"), fReply));
 
         char *e;
         int n;

Sources/CRegex.cpp

@@ -3 +3 @@
     Copyright 2005 Oliver Tappe - published under the MIT license.
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 
 #include "CRegex.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "C Regex"
+
 const status_t krx_NoMatch = PCRE_ERROR_NOMATCH;
 const status_t krx_NotBOL = PCRE_NOTBOL;
 const status_t krx_NotEOL = PCRE_NOTEOL;
@@ -152 +157 @@
 {
     if (!patt || !strlen(patt))
     {
-        fErrorStr = "Pattern is empty!";
+        fErrorStr = B_TRANSLATE("Pattern is empty!");
         return B_BAD_VALUE;
     }
     uint32 options = PCRE_UTF8 | PCRE_MULTILINE;

Sources/MAlert.cpp

@@ -5 +5 @@
 
 #include "MAlert.h"
 
+#include <Catalog.h>
 #include <Beep.h>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "M Alert"
 
+
 bool MAlert::sAlertIsNoisy = FALSE;
 
 bool
@@ -59 +63 @@
     else
     {
         fNumButtons = 1;
-        a1 = "OK";
+        a1 = B_TRANSLATE("OK");
         a2 = NULL;
         a3 = NULL;
     }
-    fAlert = new BAlert("Alert", message, a1, a2, a3,
+    fAlert = new BAlert(B_TRANSLATE("Alert"), message, a1, a2, a3,
         B_WIDTH_AS_USUAL, type);
 
     // The Escape key shall trigger the second button from the right

Sources/PAbout.cpp

@@ -43 +43 @@
 #   include "PApp.h"
 #endif
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P About"
+
 const char kAboutText[] =
+        B_TRANSLATE_MARK(
         "Pe 2.4.3 Open Source Version\n\n"
         "a high performance editor\n"
         "created by Maarten Hekkelman.\n"
@@ -76 +82 @@
         "Oscar Lesta\n"
         "Rainer Riedl\n"
         "Stephan Aßmus\n\n\n"
-        "...and thanks to everyone we forgot, too!\n\n";
+        "...and thanks to everyone we forgot, too!\n\n");
 
 #ifdef __HAIKU__
-const char kAboutText2[] = "Haiku Rules!";
+const char kAboutText2[] = B_TRANSLATE_MARK("Haiku Rules!");
 #else
-const char kAboutText2[] = "BeOS Rules!";
+const char kAboutText2[] = B_TRANSLATE_MARK("BeOS Rules!");
 #endif
 
 #if STANDALONE

Sources/CLanguageAddOn.cpp

@@ -33 +33 @@
     Created: 12/07/97 22:53:14 by Maarten Hekkelman
 */
 
+#include <Catalog.h>
+
 #include "pe.h"
 #include "PText.h"
 #include "PApp.h"
@@ -46 +48 @@
 #include "HError.h"
 #include "HColorUtils.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT ""
+
 CLanguageProxy::CLanguageProxy(CLanguageInterface& intf, const char *text, int size,
     int *starts, rgb_color *colors)
     : fText(text)
@@ -114 +119 @@
 void CLanguageProxy::AddFunction(const char *name, const char *match,
     int offset, bool italic, const char *params)
 {
-    FailNilMsg(fFunctionScanHandler, "Not a valid call in this context");
+    FailNilMsg(fFunctionScanHandler, B_TRANSLATE("Not a valid call in this context"));
     fFunctionScanHandler->AddFunction(name, match, offset, italic, fNestLevel, params);
 } /* CLanguageProxy::AddFunction */
 
 void CLanguageProxy::AddInclude(const char *name, const char *open, bool italic)
 {
-    FailNilMsg(fFunctionScanHandler, "Not a valid call in this context");
+    FailNilMsg(fFunctionScanHandler, B_TRANSLATE("Not a valid call in this context"));
     fFunctionScanHandler->AddInclude(name, open, italic);
 } /* CLanguageProxy::AddFunction */
 
 void CLanguageProxy::AddSeparator(const char* nm)
 {
-    FailNilMsg(fFunctionScanHandler, "Not a valid call in this context");
+    FailNilMsg(fFunctionScanHandler, B_TRANSLATE("Not a valid call in this context"));
     BString name;
     if (nm) {
         while(isspace(*nm) || *nm=='-')

Sources/PMessageWindow.cpp

@@ -45 +45 @@
 #include "HDefines.h"
 #include "PMessages.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Message Window"
+
 BBitmap *PMessageItem::sfInfoIcon = NULL;
 BBitmap *PMessageItem::sfInfoIconSelected = NULL;
 BBitmap *PMessageItem::sfErrorIcon = NULL;
@@ -57 +62 @@
     unsigned char *icon;
     
     icon = (unsigned char *)HResources::GetResource('MICN', id);
-    if (!icon) THROW(("Missing or corrupted MICN resource #%d", id));
+    if (!icon) THROW((B_TRANSLATE("Missing or corrupted MICN resource #%d"), id));
     
     normal = new BBitmap(BRect(0, 0, 15, 15), B_COLOR_8_BIT);
     FailNil(normal);

Sources/PTextBuffer.cpp

@@ -36 +36 @@
 #include "Utils.h"
 #include "HError.h"
 
+#include <Catalog.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Text Buffer"
+
 const int
     kBlockSize = 2048;
 
@@ -222 +227 @@
 {
     char t[4];
     memcpy(t, fText + fPhysicalSize, 4);
-    printf("logical size: %d, physical size: %d, gap: %d, gapsize: %d, trailer: %4.4s\n",
+    printf(B_TRANSLATE("logical size: %d, physical size: %d, gap: %d, gapsize: %d, trailer: %4.4s\n"),
         fLogicalSize, fPhysicalSize, fGap, fGapSize, t);
 } /* PTextBuffer::PrintToStream */
 

Sources/HLazyObject.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 #include "HLazyObject.h"
+
+#include <Catalog.h>
+
 #include <memory>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "H Lazy Object"
+
 HLazyObject::HLazyObject(BLooper *looper)
 {
     looper->AddHandler(this);
@@ -81 +87 @@
         default:
         {
             BMessage reply;
-            reply.AddString("Error", "Don't know what to do with this message");
+            reply.AddString("Error", B_TRANSLATE("Don't know what to do with this message"));
             msg->SendReply(&reply);
             break;
         }
@@ -93 +99 @@
     BMessage reply;
     
     char s[256];
-    sprintf(s, "Sorry, but I don't have a property called \"%s\"", property);
+    sprintf(s, B_TRANSLATE("Sorry, but I don't have a property called \"%s\""), property);
     reply.AddString("Error", s);
 
     msg->SendReply(&reply);
@@ -104 +110 @@
     BMessage reply;
 
     char s[256];
-    sprintf(s, "Sorry, but I don't have a property called \"%s\"", property);
+    sprintf(s, B_TRANSLATE("Sorry, but I don't have a property called \"%s\""), property);
     reply.AddString("Error", s);
 
     msg->SendReply(&reply);

Sources/PProjectWindow.cpp

@@ -35 +35 @@
 
 #include "pe.h"
 
+#include <Catalog.h>
 #include <stack>
 
 #include <fs_attr.h>
@@ -60 +61 @@
 #include "ResourcesToolbars.h"
 #include "Utils.h"
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "P Project Window"
+
 const unsigned long msg_Done = 'done';
 
 PProjectWindow*
@@ -271 +275 @@
     try
     {
         if (!fPrjFile)
-            THROW(("No project available"));
+            THROW((B_TRANSLATE("No project available")));
 
         fPrjFile->Save();
         SetDirty(false);
@@ -315 +319 @@
 
 const char* PProjectWindow::DefaultName() const
 {
-    return "Untitled Project";
+    return B_TRANSLATE("Untitled Project");
 }
 
 const char* PProjectWindow::ErrorMsg() const
@@ -406 +410 @@
         }
 
         fPanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(this), &ref);
-        fPanel->SetButtonLabel(B_DEFAULT_BUTTON, "Add");
+        fPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Add"));
         fPanel->Show();
     }
 } /* PProjectWindow::AddFiles */
@@ -434 +438 @@
                     = dynamic_cast<CProjectGroupItem*>(projectItem->ModelItem());
                 if (projectGroupItem) {
                     BAlert* alert
-                        = new BAlert( "Pe Message",
-                                          "You can't remove a group-item",
-                                          "Ah, Ok", NULL, NULL,
+                        = new BAlert( B_TRANSLATE("Pe Message"),
+                                          B_TRANSLATE("You can't remove a group-item"),
+                                          B_TRANSLATE("Ah, Ok"), NULL, NULL,
                                           B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
                                           B_WARNING_ALERT);
                     alert->SetShortcut( 0, B_ESCAPE);