Updated TR_CONTEXT to be B_TRANSLATE_CONTEXT, relating to #5408.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36733 a95241bf-73f2-0310-859d-f6bbb57e9c96
2010-05-07 20:19:06 +00:00
parent 483e12623e
commit 4eb0cbb044
159 changed files with 328 additions and 328 deletions
@@ -17,7 +17,7 @@
 #include "ZipOMaticWindow.h"


-#define TR_CONTEXT "file:ZipOMatic.cpp"
+#define B_TRANSLATE_CONTEXT "file:ZipOMatic.cpp"


 int
@@ -33,7 +33,7 @@
 #include "ZipperThread.h"


-#define TR_CONTEXT "file:ZipOMaticWindow.cpp"
+#define B_TRANSLATE_CONTEXT "file:ZipOMaticWindow.cpp"


 ZippoWindow::ZippoWindow(BList windowList, bool keepOpen)
@@ -27,7 +27,7 @@
 #include "ZipOMaticWindow.h"


-#define TR_CONTEXT "file:ZipperThread.cpp"
+#define B_TRANSLATE_CONTEXT "file:ZipperThread.cpp"


 ZipperThread::ZipperThread(BMessage* refsMessage, BWindow* window)
@@ -295,8 +295,8 @@ AboutApp::AboutApp()
 //	#pragma mark -


-#undef TR_CONTEXT
-#define TR_CONTEXT "AboutWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "AboutWindow"

 AboutWindow::AboutWindow()
 	: BWindow(BRect(0, 0, 500, 300), B_TRANSLATE("About this system"),
@@ -438,8 +438,8 @@ CropView::DoLayout()

 //	#pragma mark - AboutView

-#undef TR_CONTEXT
-#define TR_CONTEXT "AboutView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "AboutView"

 AboutView::AboutView()
 	: BView("aboutview", B_WILL_DRAW | B_PULSE_NEEDED),
@@ -17,8 +17,8 @@
 #include <Message.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "Utilities"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Utilities"


 BString
@@ -16,8 +16,8 @@
 #include <TextView.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "BootManager"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BootManager"


 static const char* kSignature = "application/x-vnd.Haiku-bootman";
@@ -35,7 +35,7 @@
 #include <String.h>


-#define TR_CONTEXT "BootManagerController"
+#define B_TRANSLATE_CONTEXT "BootManagerController"


 BootManagerController::BootManagerController()
@@ -25,8 +25,8 @@
 #include "tracker_private.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "BootManagerWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BootManagerWindow"



@@ -23,8 +23,8 @@
 #include <TextView.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "DefaultPartitionPage"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "DefaultPartitionPage"


 enum {
@@ -17,8 +17,8 @@
 #include <string.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "EntryPage"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "EntryPage"


 EntryPage::EntryPage(BMessage* settings, BRect frame, const char* name)
@@ -21,8 +21,8 @@
 #include <String.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "FileSelectionPage"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "FileSelectionPage"


 const uint32 kMsgOpenFilePanel = 'open';
@@ -37,8 +37,8 @@
 #include "BootLoader.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "LegacyBootDrive"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "LegacyBootDrive"
 #define USE_SECOND_DISK 0
 #define GET_FIRST_BIOS_DRIVE 1

@@ -24,8 +24,8 @@
 #include <String.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "PartitionsPage"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PartitionsPage"


 const uint32 kMessageShow = 'show';
@@ -17,8 +17,8 @@
 #include <string.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "UninstallPage"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "UninstallPage"


 UninstallPage::UninstallPage(BMessage* settings, BRect frame, const char* name)
@@ -15,8 +15,8 @@
 #include <Catalog.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "WizardView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "WizardView"


 static const float kSeparatorHeight = 2;
@@ -52,8 +52,8 @@ All rights reserved.
 #include "StatusView.h"
 #include "tracker_private.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "BeMenu"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BeMenu"

 #define ROSTER_SIG "application/x-vnd.Be-ROST"

@@ -24,8 +24,8 @@
 #include "StatusView.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "PreferencesWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PreferencesWindow"

 PreferencesWindow::PreferencesWindow(BRect frame)
 	:
@@ -120,8 +120,8 @@ DumpList(BList* itemlist)
 #endif	/* DB_ADDONS */


-#undef TR_CONTEXT
-#define TR_CONTEXT "Tray"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Tray"

 // don't change the name of this view to anything other than "Status"!

@@ -68,8 +68,8 @@ enum {
 };


-#undef TR_CONTEXT
-#define TR_CONTEXT "TimeView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "TimeView"

 TTimeView::TTimeView(float maxWidth, float height, bool showSeconds,
 	bool milTime, bool fullDate, bool euroDate, bool)
@@ -60,8 +60,8 @@ const int32 kListFloater = 5;
 const int32 kSystemFloater = 6;


-#undef TR_CONTEXT
-#define TR_CONTEXT "WindowMenu"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "WindowMenu"

 bool
 TWindowMenu::WindowShouldBeListed(uint32 behavior)
@@ -28,7 +28,7 @@
 #include <String.h>


-#define TR_CONTEXT "CreateParamsPanel"
+#define B_TRANSLATE_CONTEXT "CreateParamsPanel"


 class CreateParamsPanel::EscapeFilter : public BMessageFilter {
@@ -18,7 +18,7 @@
 #include "MainWindow.h"


-#define TR_CONTEXT "DiskView"
+#define B_TRANSLATE_CONTEXT "DiskView"

 using BPrivate::HashMap;
 using BPrivate::HashKey32;
@@ -24,7 +24,7 @@
 #include <TextControl.h>


-#define TR_CONTEXT "InitParamsPanel"
+#define B_TRANSLATE_CONTEXT "InitParamsPanel"


 class InitParamsPanel::EscapeFilter : public BMessageFilter {
@@ -43,7 +43,7 @@
 #include "tracker_private.h"


-#define TR_CONTEXT "MainWindow"
+#define B_TRANSLATE_CONTEXT "MainWindow"


 class ListPopulatorVisitor : public BDiskDeviceVisitor {
@@ -17,7 +17,7 @@
 #include "Support.h"


-#define TR_CONTEXT "PartitionList"
+#define B_TRANSLATE_CONTEXT "PartitionList"


 // #pragma mark - BBitmapStringField
@@ -18,7 +18,7 @@
 #include <String.h>


-#define TR_CONTEXT "Support"
+#define B_TRANSLATE_CONTEXT "Support"


 void
@@ -43,8 +43,8 @@ DirectoryRefFilter::Filter(const entry_ref *ref, BNode* node,

 //	#pragma mark -

-#undef TR_CONTEXT
-#define TR_CONTEXT "DirectoryFilePanel"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "DirectoryFilePanel"


 DirectoryFilePanel::DirectoryFilePanel(file_panel_mode mode, BMessenger* target,
@@ -25,8 +25,8 @@ ExpanderApp::ExpanderApp()
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "About"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "About"

 void
 ExpanderApp::AboutRequested()
@@ -21,8 +21,8 @@ const uint32 MSG_DESTUSE = 'mDeu';
 const uint32 MSG_DESTTEXT = 'mDet';
 const uint32 MSG_DESTSELECT = 'mDes';

-#undef TR_CONTEXT
-#define TR_CONTEXT "ExpanderPreferences"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ExpanderPreferences"

 ExpanderPreferences::ExpanderPreferences(BMessage *settings)
 	: BWindow(BRect(0, 0, 325, 305), "Expander", B_MODAL_WINDOW,
@@ -44,8 +44,8 @@ const uint32 MSG_DESTTEXT		= 'mDTX';
 const uint32 MSG_SHOWCONTENTS	= 'mSCT';


-#undef TR_CONTEXT
-#define TR_CONTEXT "ExpanderWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ExpanderWindow"

 ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref,
 		BMessage* settings)
@@ -466,8 +466,8 @@ ExpanderWindow::RefsReceived(BMessage* msg)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "ExpanderMenu"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ExpanderMenu"

 void
 ExpanderWindow::_AddMenuBar(BLayout* layout)
@@ -507,8 +507,8 @@ ExpanderWindow::_AddMenuBar(BLayout* layout)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "ExpanderWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ExpanderWindow"

 void
 ExpanderWindow::StartExpanding()
@@ -34,8 +34,8 @@
 #include <TextView.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "UninstallView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "UninstallView"


 enum {
@@ -14,8 +14,8 @@
 #include <Locale.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "UninstallWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "UninstallWindow"


 UninstallWindow::UninstallWindow()
@@ -21,8 +21,8 @@
 #include <stdio.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "UninstallApplication"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "UninstallApplication"


 class UninstallApplication : public BApplication {
@@ -41,8 +41,8 @@ static const uint32 kMsgAgree = 'agre';
 //"IN THE SOFTWARE.";


-#undef TR_CONTEXT
-#define TR_CONTEXT "InstallerApp"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "InstallerApp"


 int main(int, char **)
@@ -45,8 +45,8 @@
 #include "WorkerThread.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "InstallerWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "InstallerWindow"

 #define DRIVESETUP_SIG "application/x-vnd.Haiku-DriveSetup"
 #define BOOTMAN_SIG "application/x-vnd.Haiku-Bootman"
@@ -23,8 +23,8 @@
 #include "StringForSize.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackagesView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackagesView"

 #define ICON_ATTRIBUTE "INSTALLER PACKAGE: ICON"

@@ -10,8 +10,8 @@
 #include <Catalog.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "InstallProgress"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "InstallProgress"


 ProgressReporter::ProgressReporter(const BMessenger& messenger,
@@ -33,7 +33,7 @@
 #include "UnzipEngine.h"


-#define TR_CONTEXT "InstallProgress"
+#define B_TRANSLATE_CONTEXT "InstallProgress"


 //#define COPY_TRACE
@@ -79,7 +79,7 @@ of their respective holders. All rights reserved.
 #endif


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 const rgb_color kNormalTextColor = {0, 0, 0, 255};
@@ -64,7 +64,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 static const float kPlainFontSizeScale = 0.9;
@@ -51,7 +51,7 @@ of their respective holders. All rights reserved.
 #include <TextView.h>


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 enum {
@@ -70,7 +70,7 @@ of their respective holders. All rights reserved.
 #include <time.h>


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 using namespace BPrivate;
@@ -87,7 +87,7 @@ using namespace BPrivate ;
 #include "Words.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 static const char *kDictDirectory = "word_dictionary";
@@ -47,7 +47,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 TMenu::TMenu(const char *name, const char *attribute, int32 message, bool popup,
@@ -85,7 +85,7 @@ of their respective holders. All rights reserved.
 #include "Utilities.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 using namespace BPrivate;
@@ -62,7 +62,7 @@ using namespace BPrivate;
 #include "Signature.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"

 #define BUTTON_WIDTH		70
 #define BUTTON_HEIGHT		20
@@ -54,7 +54,7 @@ of their respective holders. All rights reserved.
 #include <mail_encoding.h>


-#define TR_CONTEXT "Settings"
+#define B_TRANSLATE_CONTEXT "Settings"


 using namespace BPrivate ;
@@ -50,7 +50,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"


-#define TR_CONTEXT "Mail"
+#define B_TRANSLATE_CONTEXT "Mail"


 extern BRect		signature_window;
@@ -28,8 +28,8 @@
 #include "MidiPlayerApp.h"
 #include "MidiPlayerWindow.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "Main Application"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Main Application"

 MidiPlayerApp::MidiPlayerApp()
 	: BApplication(MIDI_PLAYER_SIGNATURE)
@@ -38,8 +38,8 @@
 #define _W(a) (a->Frame().Width())
 #define _H(a) (a->Frame().Height())

-#undef TR_CONTEXT
-#define TR_CONTEXT "Main Window"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Main Window"

 //------------------------------------------------------------------------------

@@ -27,8 +27,8 @@

 #include "ScopeView.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "Scope View"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Scope View"


 //------------------------------------------------------------------------------
@@ -17,8 +17,8 @@
 #include <TranslatorRoster.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageImageViewer"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageImageViewer"

 enum {
 	P_MSG_CLOSE = 'pmic'
@@ -18,8 +18,8 @@
 #include <kernel/OS.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageInfo"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageInfo"

 #define RETURN_AND_SET_STATUS(err) fStatus = err; \
 	fprintf(stderr, "err at %s():%d: %x\n", __FUNCTION__, __LINE__, err); \
@@ -19,8 +19,8 @@
 #include <stdio.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageInstall"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageInstall"


 static int32
@@ -25,8 +25,8 @@
 #include "zlib.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageItem"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageItem"

 enum {
 	P_CHUNK_SIZE = 256
@@ -497,7 +497,7 @@ PackageItem::ParseData(uint8 *buffer, BFile *file, uint64 originalSize,
 // #pragma mark - PackageScript


-PackageScript::PackageScript(BFile *parent, uint64 offset, uint64 size, 
+PackageScript::PackageScript(BFile *parent, uint64 offset, uint64 size,
 		uint64 originalSize)
 	:
 	PackageItem(parent, NULL, 0, 0, 0, offset, size),
@@ -563,7 +563,7 @@ PackageScript::DoInstall(const char *path, ItemState *state)
 }


-const uint32 
+const uint32
 PackageScript::ItemKind()
 {
 	return P_KIND_SCRIPT;
@@ -739,7 +739,7 @@ PackageDirectory::DoInstall(const char *path, ItemState *state)
 }


-const uint32 
+const uint32
 PackageDirectory::ItemKind()
 {
 	return P_KIND_DIRECTORY;
@@ -905,7 +905,7 @@ PackageFile::DoInstall(const char *path, ItemState *state)
 }


-const uint32 
+const uint32
 PackageFile::ItemKind()
 {
 	return P_KIND_FILE;
@@ -1040,7 +1040,7 @@ PackageLink::DoInstall(const char *path, ItemState *state)
 }


-const uint32 
+const uint32
 PackageLink::ItemKind()
 {
 	return P_KIND_SYM_LINK;
@@ -18,8 +18,8 @@
 #include <stdio.h>
 #include <string.h>

-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageStatus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageStatus"

 StopButton::StopButton()
 	:
@@ -23,8 +23,8 @@ enum {
 	P_MSG_DECLINE
 };

-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageTextViewer"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageTextViewer"


 PackageTextViewer::PackageTextViewer(const char *text, bool disclaimer)
@@ -35,8 +35,8 @@
 #include <stdio.h> // For debugging


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageView"

 const float kMaxDescHeight = 125.0f;
 const uint32 kSeparatorIndex = 3;
@@ -15,8 +15,8 @@
 #include <Locale.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "PackageWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PackageWindow"


 PackageWindow::PackageWindow(const entry_ref *ref)
@@ -21,8 +21,8 @@

 #include <stdio.h>

-#undef TR_CONTEXT
-#define TR_CONTEXT "Packageinstaller main"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Packageinstaller main"

 class PackageInstaller : public BApplication {
 	public:
@@ -93,8 +93,8 @@ PairsView::_HasBitmap(BList& bitmaps, BBitmap* bitmap)
 	return false;
 }

-#undef TR_CONTEXT
-#define TR_CONTEXT "PairsView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PairsView"

 void
 PairsView::_ReadRandomIcons()
@@ -29,8 +29,8 @@
 // #pragma mark - PairsWindow


-#undef TR_CONTEXT
-#define TR_CONTEXT "PairsWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PairsWindow"

 const uint32 MENU_NEW					= 'MGnw';
 const uint32 MENU_SIZE					= 'MGsz';
@@ -37,8 +37,8 @@ enum {
 	MSG_KEYMAP_SELECTED		= 'kmps'
 };

-#undef TR_CONTEXT
-#define TR_CONTEXT "BootPromptWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BootPromptWindow"


 class LanguageItem : public BStringItem {
@@ -93,8 +93,8 @@ public:
 // #pragma mark - ScreenshotWindow


-#undef TR_CONTEXT
-#define TR_CONTEXT "ScreenshotWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ScreenshotWindow"


 ScreenshotWindow::ScreenshotWindow()
@@ -74,8 +74,8 @@ PrintOptions::SetHeight(float h)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "PrintOptionsWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "PrintOptionsWindow"

 PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions* options,
 	BWindow* listener)
@@ -20,8 +20,8 @@

 static const uint32 kMsgShow = 'show';

-#undef TR_CONTEXT
-#define TR_CONTEXT "ProgressWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ProgressWindow"


 ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center)
@@ -32,8 +32,8 @@
 #include "ShowImageConstants.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "ResizerWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ResizerWindow"

 ResizerWindow::ResizerWindow(BMessenger target, int32 width, int32 height)
 	:
@@ -47,8 +47,8 @@ ShowImageApp::~ShowImageApp()
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "AboutWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "AboutWindow"

 void
 ShowImageApp::AboutRequested()
@@ -1248,8 +1248,8 @@ ShowImageView::_OutputFormatForType(BBitmap* bitmap, const char* type,
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "SaveToFile"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "SaveToFile"


 void
@@ -183,8 +183,8 @@ ShowImageWindow::ShowImageWindow(const entry_ref* ref,
 	fImageView->SetImage(ref);
 	fImageView->SetTrackerMessenger(trackerMessenger);

-#undef TR_CONTEXT
-#define TR_CONTEXT "LoadAlerts"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "LoadAlerts"

 	if (InitCheck() != B_OK) {
 		BAlert* alert;
@@ -200,8 +200,8 @@ ShowImageWindow::ShowImageWindow(const entry_ref* ref,
 		return;
 	}

-#undef TR_CONTEXT
-#define TR_CONTEXT "Menus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"

 	// add View menu here so it can access ShowImageView methods
 	BMenu* menu = new BMenu(B_TRANSLATE("View"));
@@ -255,8 +255,8 @@ ShowImageWindow::BuildContextMenu(BMenu* menu)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "Menus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"

 void
 ShowImageWindow::_BuildViewMenu(BMenu* menu, bool popupMenu)
@@ -1016,8 +1016,8 @@ bs_printf(BString* string, const char* format, ...)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "ClosePrompt"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ClosePrompt"

 bool
 ShowImageWindow::_ClosePrompt()
@@ -22,8 +22,8 @@
 #include <TextControl.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "FindandReplaceWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "FindandReplaceWindow"

 FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
 	bool caseState, bool wrapState, bool backState)
@@ -25,8 +25,8 @@
 #include <TextControl.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "FindandReplaceWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "FindandReplaceWindow"

 ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler,
 	BString* searchString, 	BString *replaceString,
@@ -80,8 +80,8 @@ namespace

 //	#pragma mark -

-#undef TR_CONTEXT
-#define TR_CONTEXT "Open_and_SaveAsPanel"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel"

 StyledEditApp::StyledEditApp()
 	: BApplication(APP_SIGNATURE),
@@ -50,8 +50,8 @@ const float kLineViewWidth = 30.0;
 const char* kInfoAttributeName = "StyledEdit-info";


-#undef TR_CONTEXT
-#define TR_CONTEXT "StyledEditWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "StyledEditWindow"


 // This is a temporary solution for building BString with printf like format.
@@ -102,8 +102,8 @@ StyledEditWindow::~StyledEditWindow()
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "Menus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"


 void
@@ -866,8 +866,8 @@ StyledEditWindow::Quit()
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "QuitAlert"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "QuitAlert"


 bool
@@ -898,8 +898,8 @@ StyledEditWindow::QuitRequested()
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "SaveAlert"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "SaveAlert"


 status_t
@@ -979,8 +979,8 @@ StyledEditWindow::Save(BMessage* message)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "Open_and_SaveAsPanel"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel"


 status_t
@@ -1033,8 +1033,8 @@ StyledEditWindow::SaveAs(BMessage* message)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "LoadAlert"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "LoadAlert"


 status_t
@@ -1128,8 +1128,8 @@ StyledEditWindow::OpenFile(entry_ref* ref)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "RevertToSavedAlert"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "RevertToSavedAlert"


 void
@@ -1169,8 +1169,8 @@ StyledEditWindow::RevertToSaved()
 	if (_LoadFile(&ref) != B_OK)
 		return;

-#undef TR_CONTEXT
-#define TR_CONTEXT "Menus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"

 	// clear undo modes
 	fUndoItem->SetLabel(B_TRANSLATE("Can't undo"));
@@ -1497,8 +1497,8 @@ StyledEditWindow::SetFontStyle(const char* fontFamily, const char* fontStyle)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "Menus"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Menus"


 void
@@ -29,8 +29,8 @@
 #include "TermConst.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal AppearancePrefView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal AppearancePrefView"


 static bool
@@ -14,8 +14,8 @@
 #include <Locale.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal arguments parsing"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal arguments parsing"


 Arguments::Arguments(int defaultArgsNum, const char * const *defaultArgs)
@@ -26,8 +26,8 @@ const uint32 MSG_FIND_HIDE = 'Fhid';
 const uint32 TOGGLE_FIND_CONTROL = 'MTFG';
 const BRect kWindowFrame(10, 30, 250, 200);

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal FindWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal FindWindow"

 FindWindow::FindWindow(BMessenger messenger, const BString& str,
 		bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
@@ -241,8 +241,8 @@ PrefHandler::getFloat(const char *key)
 	return atof(value);
 }

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal getString"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal getString"

 const char*
 PrefHandler::getString(const char *key)
@@ -267,8 +267,8 @@ PrefHandler::getBool(const char *key)
 }


-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal getRGB"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal getRGB"

 /** Returns RGB data from given key. */

@@ -23,8 +23,8 @@

 #include <stdio.h>

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal PrefWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal PrefWindow"

 PrefWindow::PrefWindow(const BMessenger &messenger)
 	: BWindow(BRect(0, 0, 375, 185), B_TRANSLATE("Terminal settings"),
@@ -318,8 +318,8 @@ initialize_termios(struct termios &tio)
 	tio.c_cc[VSUSP]  = CSUSP;		/* '^Z' */
 }

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal Shell"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal Shell"

 status_t
 Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **argv)
@@ -62,8 +62,8 @@ SmartTabView::SetInsets(float left, float top, float right, float bottom)
 	fInsets.bottom = bottom;
 }

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal SmartTabView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal SmartTabView"

 void
 SmartTabView::MouseDown(BPoint point)
@@ -53,8 +53,8 @@ main()
 	return 0;
 }

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal TermApp"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal TermApp"

 TermApp::TermApp()
 	: BApplication(TERM_SIGNATURE),
@@ -83,8 +83,8 @@ enum {
 	SELECT_LINES
 };

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal TermView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal TermView"

 static property_info sPropList[] = {
 	{ "encoding",
@@ -54,8 +54,8 @@ const static uint32 kIncreaseFontSize = 'InFs';
 const static uint32 kDecreaseFontSize = 'DcFs';
 const static uint32 kSetActiveTab = 'STab';

-#undef TR_CONTEXT
-#define TR_CONTEXT "Terminal TermWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Terminal TermWindow"

 class CustomTermView : public TermView {
 public:
@@ -33,8 +33,8 @@ using BPrivate::LocaleBackend;
 #include <binary_compatibility/Interface.h>


-#undef TR_CONTEXT
-#define TR_CONTEXT "ColorControl"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "ColorControl"

 static const uint32 kMsgColorEntered = 'ccol';
 static const uint32 kMinCellSize = 6;
@@ -29,8 +29,8 @@
 #include "ColorSet.h"


-#undef TR_CONTEXT
-#define TR_CONTEXT "Colors tab"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Colors tab"

 #define COLOR_DROPPED 'cldp'
 #define DECORATOR_CHANGED 'dcch'
@@ -18,8 +18,8 @@
 #include "APRView.h"
 #include "defs.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "APRWindow"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "APRWindow"

 static const uint32 kMsgSetDefaults = 'dflt';
 static const uint32 kMsgRevert = 'rvrt';
@@ -27,8 +27,8 @@

 #include "APRWindow.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "AntialiasingSettingsView"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "AntialiasingSettingsView"


 //#define DISABLE_HINTING_CONTROL
@@ -19,8 +19,8 @@
 #include <String.h>
 #include "ColorSet.h"

-#undef TR_CONTEXT
-#define TR_CONTEXT "Colors tab"
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Colors tab"

 static ColorDescription sColorDescriptionTable[] =
 {
@@ -18,7 +18,7 @@
 #include "BackgroundsView.h"


-#define TR_CONTEXT "Main Window"
+#define B_TRANSLATE_CONTEXT "Main Window"


 static const char* kSignature = "application/x-vnd.Haiku-Backgrounds";
@@ -32,7 +32,7 @@
 #include "ImageFilePanel.h"


-#define TR_CONTEXT "Main View"
+#define B_TRANSLATE_CONTEXT "Main View"


 static const uint32 kMsgApplySettings = 'aply';
@@ -19,7 +19,7 @@
 #include <Window.h>


-#define TR_CONTEXT "Image Filepanel"
+#define B_TRANSLATE_CONTEXT "Image Filepanel"


 ImageFilePanel::ImageFilePanel(file_panel_mode mode, BMessenger* target,
@@ -18,7 +18,7 @@
 #include <TextView.h>


-#define TR_CONTEXT "Device View"
+#define B_TRANSLATE_CONTEXT "Device View"

 BluetoothDeviceView::BluetoothDeviceView(BRect frame, BluetoothDevice* bDevice,
 	uint32 resizingMode, uint32 flags)
@@ -15,7 +15,7 @@
 #include "defs.h"


-#define TR_CONTEXT "main"
+#define B_TRANSLATE_CONTEXT "main"

 BluetoothApplication::BluetoothApplication(void)
 :	BApplication(BLUETOOTH_APP_SIGNATURE)
@@ -26,7 +26,7 @@
 #include "defs.h"
 #include "BluetoothWindow.h"

-#define TR_CONTEXT "Settings view"
+#define B_TRANSLATE_CONTEXT "Settings view"

 static const int32 kMsgSetAntialiasing = 'anti';
 static const int32 kMsgSetDeviceClassDesktop = 'sDCd';
@@ -20,7 +20,7 @@

 #include "defs.h"

-#define TR_CONTEXT "Window"
+#define B_TRANSLATE_CONTEXT "Window"

 static const uint32 kMsgSetDefaults = 'dflt';
 static const uint32 kMsgRevert = 'rvrt';
@@ -16,7 +16,7 @@
 #include <SpaceLayoutItem.h>
 #include <StringView.h>

-#define TR_CONTEXT "Extended local device view"
+#define B_TRANSLATE_CONTEXT "Extended local device view"

 ExtendedLocalDeviceView::ExtendedLocalDeviceView(BRect frame,
 	LocalDevice* bDevice, uint32 resizingMode, uint32 flags)
@@ -26,7 +26,7 @@
 #include "DeviceListItem.h"
 #include "InquiryPanel.h"

-#define TR_CONTEXT "Inquiry panel"
+#define B_TRANSLATE_CONTEXT "Inquiry panel"

 using Bluetooth::DeviceListItem;

@@ -26,7 +26,7 @@
 #include "InquiryPanel.h"
 #include "RemoteDevicesView.h"

-#define TR_CONTEXT "Remote devices"
+#define B_TRANSLATE_CONTEXT "Remote devices"

 static const uint32 kMsgAddDevices = 'ddDv';
 static const uint32 kMsgRemoveDevice = 'rmDv';
@@ -18,7 +18,7 @@
 #include <MenuField.h>
 #include <SpaceLayoutItem.h>

-#define TR_CONTEXT "CPU Frequency View"
+#define B_TRANSLATE_CONTEXT "CPU Frequency View"

 const char* kCPUFreqPreferencesFile = "CPUFrequency";
 const char* kPrefSignature = "application/x-vnd.Haiku-CPUFrequencyPref";
--- a/Show More
+++ b/Show More