Ticket #5908: codycamLocalization.patch

src/apps/codycam/SettingsHandler.cpp

@@ -5 +5 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <Catalog.h>
 #include <Debug.h>
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
 #include <FindDirectory.h>
+#include <Locale.h>
 #include <Path.h>
 #include <StopWatch.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "SettingsHandler"
 
 #if 0
 static int
@@ -56 +60 @@
 {
     fFile = fopen(fFileName, "r");
     if (!fFile) {
-        PRINT(("Error opening %s\n", fFileName));
+        PRINT((TR("Error opening %s\n"), fFileName));
         return;
     }
     fBuffer = new char [kBufferSize];
@@ -95 +99 @@
         fCurrentArgv[fArgc] = 0;
         const char *result = (argvHandlerFunc)(fArgc, fCurrentArgv, passThru);
         if (result)
-            printf("File %s; Line %ld # %s", fFileName, fLineNo, result);
+            printf(TR("File %s; Line %ld # %s"), fFileName, fLineNo, result);
         MakeArgvEmpty();
         if (result)
             return B_ERROR;
@@ -148 +152 @@
 
 
 status_t 
-ArgvParser::EachArgv(const char* name, ArgvHandler argvHandlerFunc, void* passThru)
+ArgvParser::EachArgv(const char* name, ArgvHandler argvHandlerFunc, 
+    void* passThru)
 {
     ArgvParser parser(name);
     return parser.EachArgvPrivate(name, argvHandlerFunc, passThru);
@@ -166 +171 @@
         if (ch == EOF) {
             // done with file
             if (fInDoubleQuote || fInSingleQuote) {
-                printf("File %s # unterminated quote at end of file\n", name);
+                printf(TR("File %s # unterminated quote at end of file\n"), 
+                    name);
                 result = B_ERROR;
                 break;
             }
@@ -178 +184 @@
             // handle new line
             fEatComment = false;
             if (!fSawBackslash && (fInDoubleQuote || fInSingleQuote)) {
-                printf("File %s ; Line %ld # unterminated quote\n", name, fLineNo);
+                printf(TR("File %s ; Line %ld # unterminated quote\n"), name, 
+                    fLineNo);
                 result = B_ERROR;
                 break;
             }
@@ -268 +275 @@
 {
     if (!*argv) {
         if (printError)
-            printf("rect left expected");
+            printf(TR("rect left expected"));
         return false;
     }
     result.left = atoi(*argv);
     if (!*++argv) {
         if (printError)
-            printf("rect top expected");
+            printf(TR("rect top expected"));
         return false;
     }
     result.top = atoi(*argv);
     if (!*++argv) {
         if (printError)
-            printf("rect right expected");
+            printf(TR("rect right expected"));
         return false;
     }
     result.right = atoi(*argv);
     if (!*++argv) {
         if (printError)
-            printf("rect bottom expected");
+            printf(TR("rect bottom expected"));
         return false;
     }
     result.bottom = atoi(*argv);
@@ -350 +357 @@
 
     SettingsArgvDispatcher* handler = settings->_Find(*argv);
     if (!handler)
-        return "unknown command";
+        return TR("unknown command");
     return handler->Handle(argv);
 }
 

src/apps/codycam/Settings.cpp

@@ -1 +1 @@
 #include "Settings.h"
 
+#include <Catalog.h>
+#include <Locale.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -7 +10 @@
 #include <Debug.h>
 
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "Settings"
+
 Settings* settings = NULL;
 
 
@@ -49 +55 @@
 void 
 StringValueSetting::SaveSettingValue(Settings* settings)
 {
-    printf("-------StringValueSetting::SaveSettingValue %s %s\n", Name(), fValue);
+    printf("-------StringValueSetting::SaveSettingValue %s %s\n", Name(), 
+        fValue);
     settings->Write("\"%s\"", fValue);
 }
 
@@ -80 +87 @@
     const char* defaultValue, const char *const *values,
     const char* valueExpectedErrorString,
     const char* wrongValueErrorString)
-    : StringValueSetting(name, defaultValue, valueExpectedErrorString, wrongValueErrorString),
+    : StringValueSetting(name, defaultValue, valueExpectedErrorString, 
+        wrongValueErrorString),
     fValues(values)
 {
 }
@@ -230 +238 @@
 BooleanValueSetting::Handle(const char *const *argv)
 {
     if (!*++argv) 
-        return "on or off expected";
+        return TR("on or off expected");
 
     if (strcmp(*argv, "on") == 0)
         fValue = true;
     else if (strcmp(*argv, "off") == 0)
         fValue = false;
     else
-        return "on or off expected";
+        return TR("on or off expected");
 
     return 0;
 }

src/apps/codycam/SftpClient.cpp

@@ -3 +3 @@
 
 #include "SftpClient.h"
 
+
 SftpClient::SftpClient()
     : SpawningUploadClient()
 {
@@ -26 +27 @@
     cmd << " " << dir.c_str() << "\n";
     SendCommand(cmd.String());
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
     rc = true;
@@ -46 +47 @@
     BString reply;
     do {
         if ((len = ReadReply(&reply)) < 0) {
-            fprintf(stderr, "read: %d\n", len);
+            fprintf(stderr, GetReadText(), len);
             return false;
         }
-        fprintf(stderr, "reply: '%s'\n", reply.String());
+        fprintf(stderr, GetReplyText(), reply.String());
         printf("%s", reply.String());
         if (reply.FindFirst("sftp>") == 0)
             return true;
@@ -69 +70 @@
 
 
 bool
-SftpClient::Connect(const string& server, const string& login, const string& passwd)
+SftpClient::Connect(const string& server, const string& login, 
+    const string& passwd)
 {
     bool rc = false;
     BString cmd("sftp ");
@@ -82 +84 @@
         cmd << "-oPort=" << port << " ";
     cmd << login.c_str();
     cmd << "@" << host.String();
-    printf("COMMAND: '%s'\n", cmd.String());
+    printf(TR("COMMAND: '%s'\n"), cmd.String());
     SetCommandLine(cmd.String());
     rc = SpawningUploadClient::Connect(server, login, passwd);
     BString reply;
     ssize_t len;
     
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %ld\n", len);
+        fprintf(stderr, GetLReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("Connecting to ") != 0)
         return false;
     
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %ld\n", len);
+        fprintf(stderr, GetLReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst(/*[pP]*/"assword:") < 0)
         return false;
     
@@ -108 +110 @@
     write(OutputPipe(), "\n", 1);
     
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %ld\n", len);
+        fprintf(stderr, GetLReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply != "\n")
         return false;
     
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %ld\n", len);
+        fprintf(stderr, GetLReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
     return rc;
@@ -138 +140 @@
     BString reply;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("Uploading") < 0)
         return false;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
 
@@ -178 +180 @@
     // sftpd can't rename to an existing file...
     BString cmd("rm");
     cmd << " " << newPath.c_str() << "\n";
-    fprintf(stderr, "CMD: '%s'\n", cmd.String());
+    fprintf(stderr, TR("CMD: '%s'\n"), cmd.String());
     SendCommand(cmd.String());
     BString reply;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     // we don't care if it worked or not.
     //if (reply.FindFirst("Removing") != 0 && reply.FindFirst("Couldn't") )
     //  return false;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
 
@@ -203 +205 @@
     cmd << " " << oldPath.c_str() << " " << newPath.c_str() << "\n";
     SendCommand(cmd.String());
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
     rc = true;
@@ -226 +228 @@
     BString reply;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("Changing") < 0)
         return false;
 
     if ((len = ReadReply(&reply)) < 0) {
-        fprintf(stderr, "read: %d\n", len);
+        fprintf(stderr, GetReadText(), len);
         return false;
     }
-    fprintf(stderr, "reply: '%s'\n", reply.String());
+    fprintf(stderr, GetReplyText(), reply.String());
     if (reply.FindFirst("sftp>") < 0)
         return false;
 

src/apps/codycam/CodyCam.cpp

@@ -57 +57 @@
 static void
 ErrorAlert(const char* message, status_t err, BWindow *window = NULL)
 {
-    BAlert *alert = new BAlert("", message, "OK");
+    BAlert *alert = new BAlert("", message, TR("OK"));
     if (window != NULL)
         alert->CenterIn(window->Frame());
     alert->Go();
@@ -127 +127 @@
     fVideoConsumer(NULL),
     fWindow(NULL),
     fPort(0),
-    fVideoControlWindow(NULL)
+    fVideoControlWindow(NULL),
+    fAppCatalog(NULL)
 {
     chdir("/boot/home");
+    be_locale->GetAppCatalog(&fAppCatalog);
 }
 
 
@@ -152 +154 @@
 CodyCam::ReadyToRun()
 {
     fWindow = new VideoWindow(BRect(28, 28, 28, 28),
-        (const char*) "CodyCam", B_TITLED_WINDOW,
+        (const char*) TR("CodyCam"), B_TITLED_WINDOW,
         B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, &fPort);
 
     _SetUpNodes();
@@ -178 +180 @@
     switch (message->what) {
         case msg_start:
         {
-            BTimeSource* timeSource = fMediaRoster->MakeTimeSourceFor(fTimeSourceNode);
+            BTimeSource* timeSource 
+                = fMediaRoster->MakeTimeSourceFor(fTimeSourceNode);
             bigtime_t real = BTimeSource::RealTime();
             bigtime_t perf = timeSource->PerformanceTimeFor(real) + 10000;
             status_t status = fMediaRoster->StartNode(fProducerNode, perf);
             if (status != B_OK)
-                ERROR("error starting producer!");
+                ERROR(TR("error starting producer!"));
             timeSource->Release();
             break;
         }
@@ -208 +211 @@
                     BRect(2 * WINDOW_OFFSET_X + WINDOW_SIZE_X, WINDOW_OFFSET_Y,
                     2 * WINDOW_OFFSET_X + WINDOW_SIZE_X + view->Bounds().right,
                     WINDOW_OFFSET_Y + view->Bounds().bottom), view, node);
-                fMediaRoster->StartWatching(BMessenger(NULL, fVideoControlWindow), node,
-                    B_MEDIA_WEB_CHANGED);
+                fMediaRoster->StartWatching(BMessenger(NULL, 
+                    fVideoControlWindow), node, B_MEDIA_WEB_CHANGED);
                 fVideoControlWindow->Show();
             }
             break;
         }
 
         case msg_about:
-            (new BAlert("About CodyCam", "CodyCam\n\nThe Original BeOS webcam",
-                "Close"))->Go();
+            (new BAlert(TR("About CodyCam"), TR("CodyCam\n\nThe Original BeOS "
+                "webcam"), TR("Close")))->Go();
             break;
 
         case msg_control_win:
@@ -241 +244 @@
     /* find the media roster */
     fMediaRoster = BMediaRoster::Roster(&status);
     if (status != B_OK) {
-        ErrorAlert("Cannot find the media roster", status, fWindow);
+        ErrorAlert(TR("Cannot find the media roster"), status, fWindow);
         return status;
     }
 
     /* find the time source */
     status = fMediaRoster->GetTimeSource(&fTimeSourceNode);
     if (status != B_OK) {
-        ErrorAlert("Cannot get a time source", status, fWindow);
+        ErrorAlert(TR("Cannot get a time source"), status, fWindow);
         return status;
     }
 
     /* find a video producer node */
-    INFO("CodyCam acquiring VideoInput node\n");
+    INFO(TR("CodyCam acquiring VideoInput node\n"));
     status = fMediaRoster->GetVideoInput(&fProducerNode);
     if (status != B_OK) {
-        ErrorAlert("Cannot find a video source. You need a webcam to use CodyCam.", status, fWindow);
+        ErrorAlert(TR("Cannot find a video source. You need a webcam to use "
+            "CodyCam."), status, fWindow);
         return status;
     }
 
     /* create the video consumer node */
-    fVideoConsumer = new VideoConsumer("CodyCam", ((VideoWindow*)fWindow)->VideoView(),
+    fVideoConsumer = new VideoConsumer(TR("CodyCam"), 
+        ((VideoWindow*)fWindow)->VideoView(),
         ((VideoWindow*)fWindow)->StatusLine(), NULL, 0);
     if (!fVideoConsumer) {
-        ErrorAlert("Cannot create a video window", B_ERROR, fWindow);
+        ErrorAlert(TR("Cannot create a video window"), B_ERROR, fWindow);
         return B_ERROR;
     }
 
     /* register the node */
     status = fMediaRoster->RegisterNode(fVideoConsumer);
     if (status != B_OK) {
-        ErrorAlert("Cannot register the video window", status, fWindow);
+        ErrorAlert(TR("Cannot register the video window"), status, fWindow);
         return status;
     }
     fPort = fVideoConsumer->ControlPort();
 
     /* find free producer output */
     int32 cnt = 0;
-    status = fMediaRoster->GetFreeOutputsFor(fProducerNode, &fProducerOut, 1,  &cnt,
-        B_MEDIA_RAW_VIDEO);
+    status = fMediaRoster->GetFreeOutputsFor(fProducerNode, &fProducerOut, 1, 
+        &cnt, B_MEDIA_RAW_VIDEO);
     if (status != B_OK || cnt < 1) {
         status = B_RESOURCE_UNAVAILABLE;
-        ErrorAlert("Cannot find an available video stream", status, fWindow);
+        ErrorAlert(TR("Cannot find an available video stream"), status, 
+            fWindow);
         return status;
     }
 
     /* find free consumer input */
     cnt = 0;
-    status = fMediaRoster->GetFreeInputsFor(fVideoConsumer->Node(), &fConsumerIn, 1,
-        &cnt, B_MEDIA_RAW_VIDEO);
+    status = fMediaRoster->GetFreeInputsFor(fVideoConsumer->Node(), 
+        &fConsumerIn, 1, &cnt, B_MEDIA_RAW_VIDEO);
     if (status != B_OK || cnt < 1) {
         status = B_RESOURCE_UNAVAILABLE;
-        ErrorAlert("Can't find an available connection to the video window", status, fWindow);
+        ErrorAlert(TR("Can't find an available connection to the video window"), 
+            status, fWindow);
         return status;
     }
 
@@ -307 +314 @@
     status = fMediaRoster->Connect(fProducerOut.source, fConsumerIn.destination,
                 &format, &fProducerOut, &fConsumerIn);
     if (status != B_OK) {
-        ErrorAlert("Cannot connect the video source to the video window", status);
+        ErrorAlert(TR("Cannot connect the video source to the video window"), 
+            status);
         return status;
     }
 
@@ -315 +323 @@
     /* set time sources */
     status = fMediaRoster->SetTimeSourceFor(fProducerNode.node, fTimeSourceNode.node);
     if (status != B_OK) {
-        ErrorAlert("Cannot set the time source for the video source", status);
+        ErrorAlert(TR("Cannot set the time source for the video source"), 
+            status);
         return status;
     }
 
     status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(), fTimeSourceNode.node);
     if (status != B_OK) {
-        ErrorAlert("Cannot set the time source for the video window", status);
+        ErrorAlert(TR("Cannot set the time source for the video window"), 
+            status);
         return status;
     }
 
@@ -334 +344 @@
     bigtime_t initLatency = 0;
     status = fMediaRoster->GetInitialLatencyFor(fProducerNode, &initLatency);
     if (status < B_OK) {
-        ErrorAlert("Error getting initial latency for the capture node", status);
+        ErrorAlert(TR("Error getting initial latency for the capture node"), 
+            status);
         return status;
     }
 
@@ -350 +361 @@
         status = fMediaRoster->StartTimeSource(fTimeSourceNode, real);
         if (status != B_OK) {
             timeSource->Release();
-            ErrorAlert("Cannot start time source!", status);
+            ErrorAlert(TR("Cannot start time source!"), 
+                status);
             return status;
         }
         status = fMediaRoster->SeekTimeSource(fTimeSourceNode, 0, real);
         if (status != B_OK) {
             timeSource->Release();
-            ErrorAlert("Cannot seek time source!", status);
+            ErrorAlert(TR("Cannot seek time source!"), status);
             return status;
         }
     }
@@ -367 +379 @@
     /* start the nodes */
     status = fMediaRoster->StartNode(fProducerNode, perf);
     if (status != B_OK) {
-        ErrorAlert("Cannot start the video source", status);
+        ErrorAlert(TR("Cannot start the video source"), status);
         return status;
     }
     status = fMediaRoster->StartNode(fVideoConsumer->Node(), perf);
     if (status != B_OK) {
-        ErrorAlert("Cannot start the video window", status);
+        ErrorAlert(TR("Cannot start the video window"), status);
         return status;
     }
 
@@ -389 +401 @@
 
     if (fVideoConsumer) {
         /* stop */
-        INFO("stopping nodes!\n");
+        INFO(TR("stopping nodes!\n"));
 //      fMediaRoster->StopNode(fProducerNode, 0, true);
         fMediaRoster->StopNode(fVideoConsumer->Node(), 0, true);
 
@@ -398 +410 @@
             fConsumerIn.node.node, fConsumerIn.destination);
 
         if (fProducerNode != media_node::null) {
-            INFO("CodyCam releasing fProducerNode\n");
+            INFO(TR("CodyCam releasing fProducerNode\n"));
             fMediaRoster->ReleaseNode(fProducerNode);
             fProducerNode = media_node::null;
         }
@@ -436 +448 @@
     BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), "menu bar");
 
     BMenuItem* menuItem;
-    BMenu* menu = new BMenu("File");
+    BMenu* menu = new BMenu(TR("File"));
 
-    menuItem = new BMenuItem("Video settings", new BMessage(msg_video), 'P');
+    menuItem = new BMenuItem(TR("Video settings"), new BMessage(msg_video), 
+        'P');
     menuItem->SetTarget(be_app);
     menu->AddItem(menuItem);
 
     menu->AddSeparatorItem();
 
-    menuItem = new BMenuItem("Start video", new BMessage(msg_start), 'A');
+    menuItem = new BMenuItem(TR("Start video"), new BMessage(msg_start), 'A');
     menuItem->SetTarget(be_app);
     menu->AddItem(menuItem);
 
-    menuItem = new BMenuItem("Stop video", new BMessage(msg_stop), 'O');
+    menuItem = new BMenuItem(TR("Stop video"), new BMessage(msg_stop), 'O');
     menuItem->SetTarget(be_app);
     menu->AddItem(menuItem);
 
     menu->AddSeparatorItem();
 
-    menuItem = new BMenuItem("About Codycam" B_UTF8_ELLIPSIS,
+    menuItem = new BMenuItem(TR("About Codycam" B_UTF8_ELLIPSIS),
         new BMessage(msg_about), 'B');
     menuItem->SetTarget(be_app);
     menu->AddItem(menuItem);
 
     menu->AddSeparatorItem();
 
-    menuItem = new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q');
+    menuItem = new BMenuItem(TR("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q');
     menuItem->SetTarget(be_app);
     menu->AddItem(menuItem);
 
     menuBar->AddItem(menu);
 
     /* give it a gray background view */
-    fView = new BView("Background View", B_WILL_DRAW);
+    fView = new BView(TR("Background View"), B_WILL_DRAW);
     fView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
     /* add some controls */
@@ -508 +521 @@
         case msg_filename:
             if (control != NULL) {
                 strncpy(fFtpInfo.fileNameText, ((BTextControl*)control)->Text(), 63);
-                FTPINFO("file is '%s'\n", fFtpInfo.fileNameText);
+                FTPINFO(TR("file is '%s'\n"), fFtpInfo.fileNameText);
             }
             break;
 
         case msg_rate_15s:
-            FTPINFO("fifteen seconds\n");
+            FTPINFO(TR("fifteen seconds\n"));
             fFtpInfo.rate = (bigtime_t)(15 * 1000000);
             break;
 
         case msg_rate_30s:
-            FTPINFO("thirty seconds\n");
+            FTPINFO(TR("thirty seconds\n"));
             fFtpInfo.rate = (bigtime_t)(30 * 1000000);
             break;
 
         case msg_rate_1m:
-            FTPINFO("one minute\n");
+            FTPINFO(TR("one minute\n"));
             fFtpInfo.rate = (bigtime_t)(1 * 60 * 1000000);
             break;
 
         case msg_rate_5m:
-            FTPINFO("five minute\n");
+            FTPINFO(TR("five minute\n"));
             fFtpInfo.rate = (bigtime_t)(5 * 60 * 1000000);
             break;
 
         case msg_rate_10m:
-            FTPINFO("ten minute\n");
+            FTPINFO(TR("ten minute\n"));
             fFtpInfo.rate = (bigtime_t)(10 * 60 * 1000000);
             break;
 
         case msg_rate_15m:
-            FTPINFO("fifteen minute\n");
+            FTPINFO(TR("fifteen minute\n"));
             fFtpInfo.rate = (bigtime_t)(15 * 60 * 1000000);
             break;
 
         case msg_rate_30m:
-            FTPINFO("thirty minute\n");
+            FTPINFO(TR("thirty minute\n"));
             fFtpInfo.rate = (bigtime_t)(30 * 60 * 1000000);
             break;
 
         case msg_rate_1h:
-            FTPINFO("one hour\n");
+            FTPINFO(TR("one hour\n"));
             fFtpInfo.rate = (bigtime_t)(60LL * 60LL * 1000000LL);
             break;
 
         case msg_rate_2h:
-            FTPINFO("two hour\n");
+            FTPINFO(TR("two hour\n"));
             fFtpInfo.rate = (bigtime_t)(2LL * 60LL * 60LL * 1000000LL);
             break;
 
         case msg_rate_4h:
-            FTPINFO("four hour\n");
+            FTPINFO(TR("four hour\n"));
             fFtpInfo.rate = (bigtime_t)(4LL * 60LL * 60LL * 1000000LL);
             break;
 
         case msg_rate_8h:
-            FTPINFO("eight hour\n");
+            FTPINFO(TR("eight hour\n"));
             fFtpInfo.rate = (bigtime_t)(8LL * 60LL * 60LL * 1000000LL);
             break;
 
         case msg_rate_24h:
-            FTPINFO("24 hour\n");
+            FTPINFO(TR("24 hour\n"));
             fFtpInfo.rate = (bigtime_t)(24LL * 60LL * 60LL * 1000000LL);
             break;
 
         case msg_rate_never:
-            FTPINFO("never\n");
+            FTPINFO(TR("never\n"));
             fFtpInfo.rate = (bigtime_t)(B_INFINITE_TIMEOUT);
             break;
 
@@ -584 +597 @@
 
         case msg_upl_client:
             message->FindInt32("client", &(fFtpInfo.uploadClient));
-            FTPINFO("upl client = %ld\n", fFtpInfo.uploadClient);
+            FTPINFO(TR("upl client = %ld\n"), fFtpInfo.uploadClient);
             _UploadClientChanged();
             break;
 
         case msg_server:
             if (control != NULL) {
                 strncpy(fFtpInfo.serverText, ((BTextControl*)control)->Text(), 64);
-                FTPINFO("server = '%s'\n", fFtpInfo.serverText);
+                FTPINFO(TR("server = '%s'\n"), fFtpInfo.serverText);
             }
             break;
 
         case msg_login:
             if (control != NULL) {
                 strncpy(fFtpInfo.loginText, ((BTextControl*)control)->Text(), 64);
-                FTPINFO("login = '%s'\n", fFtpInfo.loginText);
+                FTPINFO(TR("login = '%s'\n"), fFtpInfo.loginText);
             }
             break;
 
         case msg_password:
             if (control != NULL) {
                 strncpy(fFtpInfo.passwordText, ((BTextControl*)control)->Text(), 64);
-                FTPINFO("password = '%s'\n", fFtpInfo.passwordText);
+                FTPINFO(TR("password = '%s'\n"), fFtpInfo.passwordText);
             }
             break;
 
         case msg_directory:
             if (control != NULL) {
                 strncpy(fFtpInfo.directoryText, ((BTextControl*)control)->Text(), 64);
-                FTPINFO("directory = '%s'\n", fFtpInfo.directoryText);
+                FTPINFO(TR("directory = '%s'\n"), fFtpInfo.directoryText);
             }
             break;
 
@@ -620 +633 @@
             if (control != NULL) {
                 fFtpInfo.passiveFtp = ((BCheckBox*)control)->Value();
                 if (fFtpInfo.passiveFtp)
-                    FTPINFO("using passive ftp\n");
+                    FTPINFO(TR("using passive ftp\n"));
             }
             break;
 
@@ -658 +671 @@
     fVideoView->SetExplicitMaxSize(BSize(VIDEO_SIZE_X, VIDEO_SIZE_Y));
 
     // Capture controls
-    fCaptureSetupBox = new BBox("Capture Controls", B_WILL_DRAW);
-    fCaptureSetupBox->SetLabel("Capture controls");
+    fCaptureSetupBox = new BBox(TR("Capture Controls"), B_WILL_DRAW);
+    fCaptureSetupBox->SetLabel(TR("Capture controls"));
 
     BGridLayout *controlsLayout = new BGridLayout(kXBuffer, 0);
     controlsLayout->SetInsets(10, 15, 5, 5);
     fCaptureSetupBox->SetLayout(controlsLayout);
 
-    fFileName = new BTextControl("File Name", "File name:",
+    fFileName = new BTextControl(TR("File Name"), TR("File name:"),
         fFilenameSetting->Value(), new BMessage(msg_filename));
     fFileName->SetTarget(BMessenger(NULL, this));
 
-    fImageFormatMenu = new BPopUpMenu("Image Format Menu");
+    fImageFormatMenu = new BPopUpMenu(TR("Image Format Menu"));
     AddTranslationItems(fImageFormatMenu, B_TRANSLATOR_BITMAP);
     fImageFormatMenu->SetTargetForItems(this);
 
@@ -682 +695 @@
     else
         fImageFormatMenu->ItemAt(0)->SetMarked(true);
 
-    fImageFormatSelector = new BMenuField("Format", "Format:",
+    fImageFormatSelector = new BMenuField("Format", TR("Format:"),
         fImageFormatMenu, NULL);
 
-    fCaptureRateMenu = new BPopUpMenu("Capture Rate Menu");
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 15 seconds",
+    fCaptureRateMenu = new BPopUpMenu(TR("Capture Rate Menu"));
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[0],
         new BMessage(msg_rate_15s)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 30 seconds",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[1],
         new BMessage(msg_rate_30s)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every minute",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[2],
         new BMessage(msg_rate_1m)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 5 minutes",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[3],
         new BMessage(msg_rate_5m)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 10 minutes",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[4],
         new BMessage(msg_rate_10m)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 15 minutes",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[5],
         new BMessage(msg_rate_15m)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 30 minutes",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[6],
         new BMessage(msg_rate_30m)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every hour",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[7],
         new BMessage(msg_rate_1h)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 2 hours",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[8],
         new BMessage(msg_rate_2h)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 4 hours",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[9],
         new BMessage(msg_rate_4h)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 8 hours",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[10],
         new BMessage(msg_rate_8h)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Every 24 hours",
+    fCaptureRateMenu->AddItem(new BMenuItem(kCaptureRate[11],
         new BMessage(msg_rate_24h)));
-    fCaptureRateMenu->AddItem(new BMenuItem("Never",
+    fCaptureRateMenu->AddItem(new BMenuItem(KCaptureRate[12],
         new BMessage(msg_rate_never)));
     fCaptureRateMenu->SetTargetForItems(this);
     fCaptureRateMenu->FindItem(fCaptureRateSetting->Value())->SetMarked(true);
-    fCaptureRateSelector = new BMenuField("Rate", "Rate:",
+    fCaptureRateSelector = new BMenuField(TR("Rate"), TR("Rate:"),
         fCaptureRateMenu, NULL);
 
     controlsLayout->AddItem(fFileName->CreateLabelLayoutItem(), 0, 0);
@@ -726 +739 @@
     controlsLayout->AddItem(BSpaceLayoutItem::CreateGlue(), 0, 3, 2);
 
     // FTP setup box
-    fFtpSetupBox = new BBox("FTP Setup", B_WILL_DRAW);
+    fFtpSetupBox = new BBox(TR("FTP Setup"), B_WILL_DRAW);
 
-    fUploadClientMenu = new BPopUpMenu("Send to" B_UTF8_ELLIPSIS);
+    fUploadClientMenu = new BPopUpMenu(TR("Send to" B_UTF8_ELLIPSIS));
     for (int i = 0; kUploadClient[i]; i++) {
         BMessage *m = new BMessage(msg_upl_client);
         m->AddInt32("client", i);
@@ -739 +752 @@
     fUploadClientSelector = new BMenuField("UploadClient", NULL,
         fUploadClientMenu, NULL);
 
-    fFtpSetupBox->SetLabel("Output");
+    fFtpSetupBox->SetLabel(TR("Output"));
     // this doesn't work with the layout manager
     // fFtpSetupBox->SetLabel(fUploadClientSelector);
-    fUploadClientSelector->SetLabel("Type:");
+    fUploadClientSelector->SetLabel(TR("Type:"));
 
     BGridLayout *ftpLayout = new BGridLayout(kXBuffer, 0);
     ftpLayout->SetInsets(10, 15, 5, 5);
     fFtpSetupBox->SetLayout(ftpLayout);
 
-    fServerName = new BTextControl("Server", "Server:",
+    fServerName = new BTextControl(TR("Server"), TR("Server:"),
         fServerSetting->Value(), new BMessage(msg_server));
     fServerName->SetTarget(this);
 
-    fLoginId = new BTextControl("Login", "Login:",
+    fLoginId = new BTextControl(TR("Login"), TR("Login:"),
         fLoginSetting->Value(), new BMessage(msg_login));
     fLoginId->SetTarget(this);
 
-    fPassword = new BTextControl("Password", "Password:",
+    fPassword = new BTextControl(TR("Password"), TR("Password:"),
         fPasswordSetting->Value(), new BMessage(msg_password));
     fPassword->SetTarget(this);
     fPassword->TextView()->HideTyping(true);
     // BeOS HideTyping() seems broken, it empties the text
     fPassword->SetText(fPasswordSetting->Value());
 
-    fDirectory = new BTextControl("Directory", "Directory:",
+    fDirectory = new BTextControl(TR("Directory"), TR("Directory:"),
         fDirectorySetting->Value(), new BMessage(msg_directory));
     fDirectory->SetTarget(this);
 
-    fPassiveFtp = new BCheckBox("Passive FTP", "Passive FTP",
+    fPassiveFtp = new BCheckBox(TR("Passive FTP"), TR("Passive FTP"),
         new BMessage(msg_passiveftp));
     fPassiveFtp->SetTarget(this);
     fPassiveFtp->SetValue(fPassiveFtpSetting->Value());
@@ -784 +797 @@
     ftpLayout->AddItem(fDirectory->CreateTextViewLayoutItem(), 1, 4);
     ftpLayout->AddView(fPassiveFtp, 0, 5, 2);
 
-    fStatusLine = new BStringView("Status Line", "Waiting" B_UTF8_ELLIPSIS);
+    fStatusLine = new BStringView(TR("Status Line"), TR("Waiting" B_UTF8_ELLIPSIS));
 
     BGroupLayout *groupLayout = new BGroupLayout(B_VERTICAL);
     groupLayout->SetInsets(kXBuffer, kYBuffer, kXBuffer, kYBuffer);
@@ -834 +847 @@
     fSettings = new Settings(filename, dirname);
 
     fServerSetting = new StringValueSetting("Server", "ftp.my.server",
-        "server address expected", "");
+        TR("server address expected"), "");
     fLoginSetting = new StringValueSetting("Login", "loginID",
-        "login ID expected", "");
-    fPasswordSetting = new StringValueSetting("Password", "password",
-        "password expected", "");
+        TR("login ID expected"), "");
+    fPasswordSetting = new StringValueSetting("Password", TR("password"),
+        TR("password expected"), "");
     fDirectorySetting = new StringValueSetting("Directory", "web/images",
-        "destination directory expected", "");
+        TR("destination directory expected"), "");
     fPassiveFtpSetting = new BooleanValueSetting("PassiveFtp", 1);
     fFilenameSetting = new StringValueSetting("StillImageFilename",
-        "codycam.jpg", "still image filename expected", "");
+        "codycam.jpg", TR("still image filename expected"), "");
     fImageFormatSettings = new StringValueSetting("ImageFileFormat",
-        "JPEG image", "image file format expected", "");
+        TR("JPEG image"), TR("image file format expected"), "");
     fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate",
-        "Every 5 minutes", kCaptureRate, "capture rate expected",
-        "unrecognized capture rate specified");
+        TR("Every 5 minutes"), kCaptureRate, TR("capture rate expected"),
+        TR("unrecognized capture rate specified"));
     fUploadClientSetting = new EnumeratedStringValueSetting("UploadClient",
-        "FTP", kUploadClient, "upload client name expected",
-        "unrecognized upload client specified");
+        TR("FTP"), kUploadClient, TR("upload client name expected"),
+        TR("unrecognized upload client specified"));
 
     fSettings->Add(fServerSetting);
     fSettings->Add(fLoginSetting);
@@ -900 +913 @@
 //  #pragma mark -
 
 
-ControlWindow::ControlWindow(const BRect& frame, BView* controls, media_node node)
-    : BWindow(frame, "Video settings", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
+ControlWindow::ControlWindow(const BRect& frame, BView* controls, 
+    media_node node) 
+    : BWindow(frame, TR("Video settings"), B_TITLED_WINDOW, 
+        B_ASYNCHRONOUS_CONTROLS)
 {
     fView = controls;
     fNode = node;

src/apps/codycam/SftpClient.h

@@ -5 +5 @@
 #include <stdio.h>
 #include <string>
 
+#include <Catalog.h>
 #include <File.h>
+#include <Locale.h>
+
 #include "SpawningUploadClient.h"
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "SftpClient"
+
 using std::string;
 
 
@@ -34 +40 @@
         void SetPassive(bool on);
     
     protected:
+    private:
+        const char *GetReplyText() {return TR("reply: '%s'\n");};
+        const char *GetReadText() {return TR("read: %d\n");};
+        const char *GetLReadText() {return TR("read: %ld\n");};
 
 };
 

src/apps/codycam/VideoConsumer.cpp

@@ -16 +16 @@
 #include <Application.h>
 #include <Buffer.h>
 #include <BufferGroup.h>
+#include <Catalog.h>
+#include <Locale.h>
 #include <MediaRoster.h>
 #include <NodeInfo.h>
 #include <scheduler.h>
@@ -32 +34 @@
 #define PROGRESS    printf
 #define LOOP        printf
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "VideoConsumer"
+
 static status_t SetFileType(BFile* file,  int32 translator, uint32 type);
 
 const media_raw_video_format vid_format = {29.97, 1, 0, 239, B_VIDEO_TOP_LEFT_RIGHT,
     1, 1, {B_RGB16, 320, 240, 320 * 4, 0, 0}};
 
 
-VideoConsumer::VideoConsumer(const char* name, BView* view, BStringView* statusLine,
-    BMediaAddOn* addon, const uint32 internalId)
-    : BMediaNode(name), BMediaEventLooper(), BBufferConsumer(B_MEDIA_RAW_VIDEO),
+VideoConsumer::VideoConsumer(const char* name, 
+    BView* view, BStringView* statusLine, BMediaAddOn* addon, 
+    const uint32 internalId)
+    : BMediaNode(name), BMediaEventLooper(), 
+    BBufferConsumer(B_MEDIA_RAW_VIDEO),
     fStatusLine(statusLine),
     fInternalID(internalId),
     fAddOn(addon),
@@ -86 +93 @@
     Quit();
 
     if (fWindow) {
-        printf("Locking the window\n");
+        printf(TR("Locking the window\n"));
         if (fWindow->Lock()) {
-            printf("Closing the window\n");
+            printf(TR("Closing the window\n"));
             fWindow->Close();
             fWindow = 0;
         }
@@ -179 +186 @@
 status_t
 VideoConsumer::RequestCompleted(const media_request_info& info)
 {
-    FUNCTION("VideoConsumer::RequestCompleted\n");
+    const char *classfunc = "VideoConsumer::RequestCompleted";
+    FUNCTION("%s\n", classfunc);
     switch (info.what) {
         case media_request_info::B_SET_OUTPUT_BUFFERS_FOR:
             if (info.status != B_OK)
-                    ERROR("VideoConsumer::RequestCompleted: Not using our buffers!\n");
+                    ERROR(TR("%s: Not using our buffers!\n"), classfunc);
             break;
 
         default:
-            ERROR("VideoConsumer::RequestCompleted: Invalid argument\n");
+            ERROR(TR("%s: Invalid argument\n"), classfunc);
             break;
     }
     return B_OK;
@@ -197 +205 @@
 status_t
 VideoConsumer::HandleMessage(int32 message, const void* data, size_t size)
 {
-    //FUNCTION("VideoConsumer::HandleMessage\n");
+    const char *classfunc = "VideoConsumer::HandleMessage";
+    //FUNCTION("%s\n", classfunc);
     ftp_msg_info* info = (ftp_msg_info*)data;
     status_t status = B_OK;
 
     switch (message) {
         case FTP_INFO:
-            PROGRESS("VideoConsumer::HandleMessage - FTP_INFO message\n");
+            PROGRESS(TR("%s - FTP_INFO message\n"), classfunc);
             fRate = info->rate;
             fImageFormat = info->imageFormat;
             fTranslator = info->translator;
@@ -234 +243 @@
 void
 VideoConsumer::BufferReceived(BBuffer* buffer)
 {
-    LOOP("VideoConsumer::Buffer #%ld received, start_time %Ld\n", buffer->ID(), buffer->Header()->start_time);
+    const char *classfunc = "VideoConsumer::BufferReceived";
+    LOOP((TR("%s #%ld received, start_time %Ld\n"), classfunc), 
+        buffer->ID(), buffer->Header()->start_time);
 
     if (RunState() == B_STOPPED) {
         buffer->Recycle();
         return;
     }
 
-    media_timed_event event(buffer->Header()->start_time, BTimedEventQueue::B_HANDLE_BUFFER,
+    media_timed_event event(buffer->Header()->start_time, 
+        BTimedEventQueue::B_HANDLE_BUFFER,
         buffer, BTimedEventQueue::B_RECYCLE_BUFFER);
     EventQueue()->AddEvent(event);
 }
 
 
 void
-VideoConsumer::ProducerDataStatus(const media_destination& forWhom, int32 status,
-    bigtime_t atMediaTime)
+VideoConsumer::ProducerDataStatus(const media_destination& forWhom, 
+    int32 status, bigtime_t atMediaTime)
 {
     FUNCTION("VideoConsumer::ProducerDataStatus\n");
 
@@ -261 +273 @@
 status_t
 VideoConsumer::CreateBuffers(const media_format& withFormat)
 {
-    FUNCTION("VideoConsumer::CreateBuffers\n");
+    const char *classfunc = "VideoConsumer::CreateBuffers";
+    FUNCTION("%s\n", classfunc);
 
     DeleteBuffers();    
         // delete any old buffers
@@ -272 +285 @@
     uint32 xSize = withFormat.u.raw_video.display.line_width;
     uint32 ySize = withFormat.u.raw_video.display.line_count;   
     color_space colorspace = withFormat.u.raw_video.display.format;
-    PROGRESS("VideoConsumer::CreateBuffers - Colorspace = %d\n", colorspace);
+    PROGRESS((TR("%s - Colorspace = %d\n"), classfunc), colorspace);
 
     fBuffers = new BBufferGroup();
     status = fBuffers->InitCheck();
     if (status != B_OK) {
-        ERROR("VideoConsumer::CreateBuffers - ERROR CREATING BUFFER GROUP\n");
+        ERROR(TR("%s - ERROR CREATING BUFFER GROUP\n"), classfunc);
         return status;
     }
     // and attach the  bitmaps to the buffer group
@@ -287 +300 @@
         if (fBitmap[j]->IsValid()) {                        
             buffer_clone_info info;
             if ((info.area = area_for(fBitmap[j]->Bits())) == B_ERROR)
-                ERROR("VideoConsumer::CreateBuffers - ERROR IN AREA_FOR\n");
+                ERROR(TR("%s - ERROR IN AREA_FOR\n"), classfunc);
             info.offset = 0;
             info.size = (size_t)fBitmap[j]->BitsLength();
             info.flags = j;
             info.buffer = 0;
 
             if ((status = fBuffers->AddBuffer(info)) != B_OK) {
-                ERROR("VideoConsumer::CreateBuffers - ERROR ADDING BUFFER TO GROUP\n");
+                ERROR(TR("%s - ERROR ADDING BUFFER TO GROUP\n"), classfunc);
                 return status;
             }
             else
-                PROGRESS("VideoConsumer::CreateBuffers - SUCCESSFUL ADD BUFFER TO GROUP\n");
+                PROGRESS(TR("%s - SUCCESSFUL ADD BUFFER TO GROUP\n"), classfunc);
         } else {
-            ERROR("VideoConsumer::CreateBuffers - ERROR CREATING VIDEO RING BUFFER: %08lx\n",
-                status);
+            ERROR((TR("%s - ERROR CREATING VIDEO RING BUFFER: "
+                "%08lx\n"), classfunc), status);
             return B_ERROR;
         }
     }
@@ -314 +327 @@
         for (int j = 0; j < 3; j++)
             if (buffList[j] != NULL) {
                 fBufferMap[j] = (uint32)buffList[j];
-                PROGRESS(" j = %d buffer = %08lx\n", j, fBufferMap[j]);
+                PROGRESS(TR(" j = %d buffer = %08lx\n"), j, fBufferMap[j]);
             } else {
-                ERROR("VideoConsumer::CreateBuffers ERROR MAPPING RING BUFFER\n");
+                ERROR(TR("%s ERROR MAPPING RING BUFFER\n"), classfunc);
                 return B_ERROR;
             }
     else
-        ERROR("VideoConsumer::CreateBuffers ERROR IN GET BUFFER LIST\n");
+        ERROR(TR("%s ERROR IN GET BUFFER LIST\n"), classfunc);
 
-    fFtpBitmap = new BBitmap(BRect(0, 0, xSize - 1, ySize - 1), B_RGB32, false, false);
+    fFtpBitmap = new BBitmap(BRect(0, 0, xSize - 1, ySize - 1), B_RGB32, 
+        false, false);
 
-    FUNCTION("VideoConsumer::CreateBuffers - EXIT\n");
+    FUNCTION(TR("%s - EXIT\n"), classfunc);
     return status;
 }
 
@@ -332 +346 @@
 void
 VideoConsumer::DeleteBuffers()
 {
-    FUNCTION("VideoConsumer::DeleteBuffers\n");
+    const char *classfunc = "VideoConsumer::DeleteBuffers";
+    FUNCTION("%s\n", classfunc);
 
     if (fBuffers) {
         delete fBuffers;
@@ -344 +359 @@
                 fBitmap[j] = NULL;
             }
     }
-    FUNCTION("VideoConsumer::DeleteBuffers - EXIT\n");
+    FUNCTION(TR("%s - EXIT\n"), classfunc);
 }
 
 
@@ -352 +367 @@
 VideoConsumer::Connected(const media_source& producer, const media_destination& where,
     const media_format& withFormat, media_input* outInput)
 {
-    FUNCTION("VideoConsumer::Connected\n");
+    const char *classfunc = "VideoConsumer::Connected";
+    FUNCTION("%s\n", classfunc);
     
     fIn.source = producer;
     fIn.format = withFormat;
     fIn.node = Node();
-    sprintf(fIn.name, "Video Consumer");
+    sprintf(fIn.name, TR("Video Consumer"));
     *outInput = fIn;
 
     uint32 userData = 0;
@@ -366 +382 @@
         BBufferConsumer::SetOutputBuffersFor(producer, fDestination, 
             fBuffers, (void *)&userData, &changeTag, true);
     else {
-        ERROR("VideoConsumer::Connected - COULDN'T CREATE BUFFERS\n");
+        ERROR(TR("%s - COULDN'T CREATE BUFFERS\n"), classfunc);
         return B_ERROR;
     }
 
     fConnectionActive = true;
 
-    FUNCTION("VideoConsumer::Connected - EXIT\n");
+    FUNCTION(TR("%s - EXIT\n"), classfunc);
     return B_OK;
 }
 
@@ -395 +411 @@
 status_t
 VideoConsumer::AcceptFormat(const media_destination& dest, media_format* format)
 {
-    FUNCTION("VideoConsumer::AcceptFormat\n");
+    const char *classfunc = "VideoConsumer::AcceptFormat";
+    FUNCTION("%s\n", classfunc);
     
     if (dest != fIn.destination) {
-        ERROR("VideoConsumer::AcceptFormat - BAD DESTINATION\n");
+        ERROR(TR("%s - BAD DESTINATION\n"), classfunc);
         return B_MEDIA_BAD_DESTINATION; 
     }
 
@@ -406 +423 @@
         format->type = B_MEDIA_RAW_VIDEO;
     
     if (format->type != B_MEDIA_RAW_VIDEO) {
-        ERROR("VideoConsumer::AcceptFormat - BAD FORMAT\n");
+        ERROR(TR("%s - BAD FORMAT\n"), classfunc);
         return B_MEDIA_BAD_FORMAT;
     }
 
@@ -416 +433 @@
         && format->u.raw_video.display.format != B_GRAY8
         &&          
         format->u.raw_video.display.format != media_raw_video_format::wildcard.display.format) {
-        ERROR("AcceptFormat - not a format we know about!\n");
+        ERROR(TR("AcceptFormat - not a format we know about!\n"));
         return B_MEDIA_BAD_FORMAT;
     }
 
@@ -426 +443 @@
 
     char formatString[256];     
     string_for_format(*format, formatString, 256);
-    FUNCTION("VideoConsumer::AcceptFormat: %s\n", formatString);
+    FUNCTION("%s: %s\n", classfunc, formatString);
 
     return B_OK;
 }
@@ -435 +452 @@
 status_t
 VideoConsumer::GetNextInput(int32* cookie, media_input* outInput)
 {
-    FUNCTION("VideoConsumer::GetNextInput\n");
+    const char *classfunc = "VideoConsumer::GetNextInput";
+    FUNCTION("%s\n", classfunc);
 
     // custom build a destination for this connection
     // put connection number in id
@@ -443 +461 @@
     if (*cookie < 1) {
         fIn.node = Node();
         fIn.destination.id = *cookie;
-        sprintf(fIn.name, "Video Consumer");
+        sprintf(fIn.name, TR("Video Consumer"));
         *outInput = fIn;
         (*cookie)++;
         return B_OK;
     } else {
-        ERROR("VideoConsumer::GetNextInput - - BAD INDEX\n");
+        ERROR(TR("%s - - BAD INDEX\n"), classfunc);
         return B_MEDIA_BAD_DESTINATION;
     }
 }
@@ -497 +515 @@
 VideoConsumer::HandleEvent(const media_timed_event* event, bigtime_t lateness,
     bool realTimeEvent)
 {
-    LOOP("VideoConsumer::HandleEvent\n");
+    const char *classfunc = "VideoConsumer::HandleEvent";
+    LOOP("%s\n", classfunc);
     
     BBuffer* buffer;
 
     switch (event->type) {
         case BTimedEventQueue::B_START:
-            PROGRESS("VideoConsumer::HandleEvent - START\n");
+            PROGRESS(TR("%s - START\n"), classfunc);
             break;
 
         case BTimedEventQueue::B_STOP:
-            PROGRESS("VideoConsumer::HandleEvent - STOP\n");
+            PROGRESS(TR("%s - STOP\n"), classfunc);
             EventQueue()->FlushEvents(event->event_time, BTimedEventQueue::B_ALWAYS,
                 true, BTimedEventQueue::B_HANDLE_BUFFER);
             break;
 
         case BTimedEventQueue::B_USER_EVENT:
-            PROGRESS("VideoConsumer::HandleEvent - USER EVENT\n");
+            PROGRESS(TR("%s - USER EVENT\n"), classfunc);
             if (RunState() == B_STARTED) {
                 fTimeToFtp = true;
-                PROGRESS("Pushing user event for %.4f, time now %.4f\n",
+                PROGRESS(TR("Pushing user event for %.4f, time now %.4f\n"),
                     (event->event_time + fRate) / M1, event->event_time/M1);
                 media_timed_event newEvent(event->event_time + fRate,
                     BTimedEventQueue::B_USER_EVENT);
@@ -526 +545 @@
 
         case BTimedEventQueue::B_HANDLE_BUFFER:
         {
-            LOOP("VideoConsumer::HandleEvent - HANDLE BUFFER\n");
+            LOOP(TR("%s - HANDLE BUFFER\n"), classfunc);
             buffer = (BBuffer *)event->pointer;
             if (RunState() == B_STARTED && fConnectionActive) {
                 // see if this is one of our buffers
@@ -545 +564 @@
                 }
                             
                 if (fFtpComplete && fTimeToFtp) {
-                    PROGRESS("VidConsumer::HandleEvent - SPAWNING FTP THREAD\n");
+                    PROGRESS(TR("%s - SPAWNING FTP THREAD\n"), classfunc);
                     fTimeToFtp = false;
                     fFtpComplete = false;
                     memcpy(fFtpBitmap->Bits(), buffer->Data(), fFtpBitmap->BitsLength());
@@ -577 +596 @@
                     }
                 }
                 else
-                    PROGRESS("VidConsumer::HandleEvent - DROPPED FRAME\n");
+                    PROGRESS(TR("%s - DROPPED FRAME\n"), classfunc);
                 buffer->Recycle();
             }
             else
@@ -586 +605 @@
         }
 
         default:
-            ERROR("VideoConsumer::HandleEvent - BAD EVENT\n");
+            ERROR(TR("%s - BAD EVENT\n"), classfunc);
             break;
     }           
 }
@@ -618 +637 @@
 #if 0
     // save a small version, too
     BBitmap* b = new BBitmap(BRect(0,0,159,119), B_RGB32, true, false);
-    BView* v = new BView(BRect(0,0,159,119), "SmallView 1", 0, B_WILL_DRAW);
+    BView* v = new BView(BRect(0,0,159,119), TR("SmallView 1"), 0, B_WILL_DRAW);
     b->AddChild(v);
 
     b->Lock();
@@ -639 +658 @@
 void
 VideoConsumer::UpdateFtpStatus(const char* status)
 {
-    printf("FTP STATUS: %s\n",status);
+    printf(TR("FTP STATUS: %s\n"),status);
     if (fView->Window()->Lock()) {
         fStatusLine->SetText(status);
         fView->Window()->Unlock();
@@ -652 +671 @@
 {
     BFile* output;
 
-    UpdateFtpStatus("Capturing Image" B_UTF8_ELLIPSIS);
+    UpdateFtpStatus(TR("Capturing Image" B_UTF8_ELLIPSIS));
 
     /* save a local copy of the image in the requested format */
     output = new BFile();
@@ -663 +682 @@
         if (err == B_OK) {
             err = SetFileType(output, fTranslator, fImageFormat);
             if (err != B_OK)
-                UpdateFtpStatus("Error setting type of output file");                           
+                UpdateFtpStatus(TR("Error setting type of output file"));                           
         }
         else
-            UpdateFtpStatus("Error writing output file");                           
+            UpdateFtpStatus(TR("Error writing output file"));                           
 
         input.DetachBitmap(&bitmap);
         output->Unset();
         delete output;
         return B_OK;
     } else {
-        UpdateFtpStatus("Error creating output file");
+        UpdateFtpStatus(TR("Error creating output file"));
         return B_ERROR;
     }                           
 }
@@ -695 +714 @@
         case 2:
             return B_OK;
         default:
-            fprintf(stderr, "invalid upload client %ld\n", fUploadClient);
+            fprintf(stderr, TR("invalid upload client %ld\n"), fUploadClient);
             return EINVAL;
     }
 
     ftp->SetPassive(fPassiveFtp);
         // ftp the local file to our web site
 
-    UpdateFtpStatus("Logging in" B_UTF8_ELLIPSIS);
+    UpdateFtpStatus(TR("Logging in" B_UTF8_ELLIPSIS));
     if (ftp->Connect((string)fServerText, (string)fLoginText, (string)fPasswordText)) {
         // connect to server
-        UpdateFtpStatus("Connected" B_UTF8_ELLIPSIS);
+        UpdateFtpStatus(TR("Connected" B_UTF8_ELLIPSIS));
 
         if (ftp->ChangeDir((string)fDirectoryText)) {
             // cd to the desired directory
-            UpdateFtpStatus("Transmitting" B_UTF8_ELLIPSIS);
+            UpdateFtpStatus(TR("Transmitting" B_UTF8_ELLIPSIS));
 
             if (ftp->PutFile((string)filename, (string)"temp")) {
                 // send the file to the server
@@ -717 +736 @@
                 ftp->Chmod((string)"temp", (string)"644");
                 // make it world readable
 
-                UpdateFtpStatus("Renaming" B_UTF8_ELLIPSIS);
+                UpdateFtpStatus(TR("Renaming" B_UTF8_ELLIPSIS));
 
                 if (ftp->MoveFile((string)"temp", (string)filename)) {
                     // change to the desired name
                     uint32 time = real_time_clock();
                     char s[80];
-                    strcpy(s, "Last Capture: ");
+                    strcpy(s, TR("Last Capture: "));
                     strcat(s, ctime((const long*)&time));
                     s[strlen(s) - 1] = 0;
                     UpdateFtpStatus(s);
@@ -731 +750 @@
                     return B_OK;
                 }
                 else
-                    UpdateFtpStatus("Rename failed");
+                    UpdateFtpStatus(TR("Rename failed"));
             }
             else
-                UpdateFtpStatus("File transmission failed");
+                UpdateFtpStatus(TR("File transmission failed"));
         }
         else
-            UpdateFtpStatus("Couldn't find requested directory on server");
+            UpdateFtpStatus(TR("Couldn't find requested directory on server"));
     }
     else
-        UpdateFtpStatus("Server login failed");
+        UpdateFtpStatus(TR("Server login failed"));
 
     delete ftp;
     return B_ERROR;

src/apps/codycam/CodyCam.h

@@ -9 +9 @@
 
 #include <Application.h>
 #include <Box.h>
+#include <Catalog.h>
 #include <CheckBox.h>
+#include <Locale.h>
 #include <Menu.h>
 #include <MenuField.h>
 #include <StringView.h>
@@ -19 +21 @@
 
 class BMediaRoster;
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "CodyCam"
 
 enum {
     msg_filename    = 'file',
@@ -59 +63 @@
 
 
 const char* kCaptureRate[] = {
-    "Every 15 seconds",
-    "Every 30 seconds",
-    "Every minute",
-    "Every 5 minutes",
-    "Every 10 minutes",
-    "Every 15 minutes",
-    "Every 30 minutes",
-    "Every hour",
-    "Every 2 hours",
-    "Every 4 hours",
-    "Every 8 hours",
-    "Every 24 hours",
-    "Never",    
+    TR("Every 15 seconds"),
+    TR("Every 30 seconds"),
+    TR("Every minute"),
+    TR("Every 5 minutes"),
+    TR("Every 10 minutes"),
+    TR("Every 15 minutes"),
+    TR("Every 30 minutes"),
+    TR("Every hour"),
+    TR("Every 2 hours"),
+    TR("Every 4 hours"),
+    TR("Every 8 hours"),
+    TR("Every 24 hours"),
+    TR("Never"),    
     0
 };
 
 
 const char* kUploadClient[] = {
-    "FTP",
-    "SFTP",
-    "Local",
+    TR("FTP"),
+    TR("SFTP"),
+    TR("Local"),
     0
 };
 
@@ -106 +110 @@
             BWindow*        fWindow;
             port_id         fPort;
             BWindow*        fVideoControlWindow;
+            BCatalog        fAppCatalog;
 };
 
 

src/apps/codycam/FtpClient.cpp

@@ -1 +1 @@
 #include "FtpClient.h"
 
+#include <Catalog.h>
+#include <Locale.h>
+
 #include <stdlib.h>
 #include <string.h>
 
+#undef TR_CONTEXT
+#define TR_CONTEXT "FtpClient"
+
 FtpClient::FtpClient()
     : FileUploadClient(),
     fState(0),
@@ -111 +117 @@
 
 
 bool
-FtpClient::Connect(const string& server, const string& login, const string& passwd)
+FtpClient::Connect(const string& server, 
+    const string& login, 
+    const string& passwd)
 {
     bool rc = false;
     int code, codeType;
@@ -373 +381 @@
     
     if (path.length() == 0)
         cmd += '/';
-printf("cmd: '%s'\n", cmd.c_str());
+printf(TR("cmd: '%s'\n"), cmd.c_str());
     if (_SendRequest(cmd) == true) {
         if (_GetReply(replyString, code, codeType) == true) {
-printf("reply: %d, %d\n", code, codeType);
+printf(TR("reply: %d, %d\n"), code, codeType);
             if (codeType == 2)
                 rc = true;
         }
@@ -424 +432 @@
     
     if (fControl != 0) {
         if (cmd.find("PASS") != string::npos)
-            printf("PASS <suppressed>  (real password sent)\n");
+            printf(TR("PASS <suppressed>  (real password sent)\n"));
         else
             printf("%s\n", ccmd.c_str());
 
@@ -540 +548 @@
     }
     
     if (!rc && outCode != 421) {
-        outString += "Remote host has closed the connection.\n";
+        outString += TR("Remote host has closed the connection.\n");
         outCode = 421;
     }