From 546208a53940a26c6379c48a7854ade1a8250fc5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Apr 2012 21:31:22 +0200 Subject: [PATCH] More catalog-related cleanup. * rename B_TRANSLATE_CONTEXT to B_TRANSLATION_CONTEXT and B_TRANSLATE_WITH_CONTEXT to B_TRANSLATE_CONTEXT, squashing a TODO * adjust all uses of both macros in Haiku's source tree * use correct header guard for collecting/Catalog.h The renamed macros require adjustments to all external applications using catalogs. --- docs/develop/makefile-engine.html | 4 +- docs/user/locale/Catalog.dox | 2 +- headers/os/locale/Catalog.h | 24 +++++------ headers/private/locale/collecting/Catalog.h | 30 +++++++------- .../bfs/InitializeParameterEditor.cpp | 4 +- .../intel/CreationParameterEditor.cpp | 4 +- .../devices/keyboard/TeamMonitorWindow.cpp | 4 +- .../match_header/ConfigView.cpp | 4 +- .../match_header/RuleFilter.cpp | 4 +- .../inbound_filters/notifier/ConfigView.cpp | 4 +- .../inbound_filters/notifier/filter.cpp | 4 +- .../spam_filter/SpamFilter.cpp | 4 +- .../spam_filter/SpamFilterConfig.cpp | 4 +- .../imap/IMAPFolderConfig.cpp | 4 +- .../inbound_protocols/imap/imap_config.cpp | 4 +- .../inbound_protocols/pop3/ConfigView.cpp | 4 +- .../inbound_protocols/pop3/pop3.cpp | 4 +- .../outbound_filters/fortune/ConfigView.cpp | 4 +- .../outbound_protocols/smtp/ConfigView.cpp | 4 +- .../outbound_protocols/smtp/smtp.cpp | 4 +- .../media/media-add-ons/mixer/AudioMixer.cpp | 4 +- .../screen_savers/butterfly/Butterfly.cpp | 4 +- .../screen_savers/debugnow/DebugNow.cpp | 4 +- .../screen_savers/haiku/ScreenSaver.cpp | 4 +- .../screen_savers/icons/IconsSaver.cpp | 4 +- src/add-ons/screen_savers/ifs/IFSSaver.cpp | 4 +- src/add-ons/screen_savers/leaves/Leaves.cpp | 4 +- src/add-ons/screen_savers/message/Message.cpp | 4 +- .../screen_savers/spider/SpiderSaver.cpp | 4 +- src/add-ons/tracker/zipomatic/ZipOMatic.cpp | 4 +- .../tracker/zipomatic/ZipOMaticWindow.cpp | 4 +- .../tracker/zipomatic/ZipperThread.cpp | 4 +- src/add-ons/translators/bmp/BMPMain.cpp | 4 +- src/add-ons/translators/bmp/BMPTranslator.cpp | 4 +- src/add-ons/translators/bmp/BMPView.cpp | 4 +- src/add-ons/translators/exr/ConfigView.cpp | 4 +- src/add-ons/translators/exr/EXRTranslator.cpp | 4 +- src/add-ons/translators/exr/main.cpp | 4 +- src/add-ons/translators/gif/GIFTranslator.cpp | 4 +- src/add-ons/translators/gif/GIFView.cpp | 4 +- src/add-ons/translators/hpgs/ConfigView.cpp | 4 +- .../translators/hpgs/HPGSTranslator.cpp | 4 +- src/add-ons/translators/hvif/HVIFMain.cpp | 4 +- .../translators/hvif/HVIFTranslator.cpp | 4 +- src/add-ons/translators/hvif/HVIFView.cpp | 4 +- src/add-ons/translators/ico/ConfigView.cpp | 4 +- src/add-ons/translators/ico/ICOTranslator.cpp | 4 +- src/add-ons/translators/ico/main.cpp | 4 +- .../translators/jpeg/JPEGTranslator.cpp | 4 +- src/add-ons/translators/jpeg/JPEGTranslator.h | 4 +- src/add-ons/translators/jpeg/be_jerror.cpp | 4 +- src/add-ons/translators/jpeg/exif_parser.cpp | 4 +- .../jpeg2000/JPEG2000Translator.cpp | 4 +- .../translators/jpeg2000/JPEG2000Translator.h | 4 +- src/add-ons/translators/pcx/ConfigView.cpp | 4 +- src/add-ons/translators/pcx/PCXTranslator.cpp | 4 +- src/add-ons/translators/pcx/main.cpp | 4 +- src/add-ons/translators/png/PNGMain.cpp | 4 +- src/add-ons/translators/png/PNGTranslator.cpp | 4 +- src/add-ons/translators/png/PNGView.cpp | 4 +- src/add-ons/translators/ppm/PPMMain.cpp | 4 +- src/add-ons/translators/ppm/PPMTranslator.cpp | 4 +- src/add-ons/translators/raw/ConfigView.cpp | 4 +- src/add-ons/translators/raw/RAWTranslator.cpp | 4 +- src/add-ons/translators/raw/main.cpp | 4 +- src/add-ons/translators/rtf/ConfigView.cpp | 4 +- src/add-ons/translators/rtf/RTFTranslator.cpp | 4 +- src/add-ons/translators/rtf/main.cpp | 4 +- src/add-ons/translators/sgi/SGIMain.cpp | 4 +- src/add-ons/translators/sgi/SGITranslator.cpp | 4 +- src/add-ons/translators/sgi/SGIView.cpp | 4 +- .../translators/shared/BaseTranslator.cpp | 4 +- .../translators/shared/TranslatorWindow.cpp | 4 +- src/add-ons/translators/stxt/STXTMain.cpp | 4 +- .../translators/stxt/STXTTranslator.cpp | 4 +- src/add-ons/translators/stxt/STXTView.cpp | 4 +- src/add-ons/translators/tga/TGAMain.cpp | 4 +- src/add-ons/translators/tga/TGATranslator.cpp | 4 +- src/add-ons/translators/tga/TGAView.cpp | 4 +- src/add-ons/translators/tiff/TIFFMain.cpp | 4 +- .../translators/tiff/TIFFTranslator.cpp | 4 +- src/add-ons/translators/tiff/TIFFView.cpp | 4 +- src/add-ons/translators/webp/ConfigView.cpp | 4 +- .../translators/webp/WebPTranslator.cpp | 4 +- src/add-ons/translators/webp/main.cpp | 4 +- src/add-ons/translators/wonderbrush/Layer.cpp | 4 +- .../wonderbrush/WonderBrushMain.cpp | 4 +- .../wonderbrush/WonderBrushTranslator.cpp | 4 +- .../wonderbrush/WonderBrushView.cpp | 4 +- src/apps/aboutsystem/AboutSystem.cpp | 8 ++-- src/apps/aboutsystem/Utilities.cpp | 4 +- src/apps/activitymonitor/ActivityMonitor.h | 4 +- src/apps/activitymonitor/ActivityView.cpp | 4 +- src/apps/activitymonitor/ActivityWindow.cpp | 4 +- src/apps/activitymonitor/DataSource.cpp | 4 +- src/apps/activitymonitor/SettingsWindow.cpp | 6 +-- src/apps/bootmanager/BootManager.cpp | 4 +- .../bootmanager/BootManagerController.cpp | 4 +- src/apps/bootmanager/BootManagerWindow.cpp | 4 +- src/apps/bootmanager/DefaultPartitionPage.cpp | 4 +- src/apps/bootmanager/DrivesPage.cpp | 4 +- src/apps/bootmanager/FileSelectionPage.cpp | 4 +- src/apps/bootmanager/LegacyBootMenu.cpp | 4 +- src/apps/bootmanager/PartitionsPage.cpp | 4 +- src/apps/bootmanager/UninstallPage.cpp | 4 +- src/apps/bootmanager/WizardView.cpp | 4 +- src/apps/bsnow/SnowView.cpp | 4 +- src/apps/cdplayer/CDPlayer.cpp | 4 +- src/apps/charactermap/CharacterMap.cpp | 4 +- src/apps/charactermap/CharacterView.cpp | 4 +- src/apps/charactermap/CharacterWindow.cpp | 4 +- src/apps/charactermap/UnicodeBlocks.cpp | 4 +- src/apps/codycam/CodyCam.cpp | 4 +- src/apps/codycam/FtpClient.cpp | 4 +- src/apps/codycam/Settings.cpp | 4 +- src/apps/codycam/SettingsHandler.cpp | 4 +- src/apps/codycam/SftpClient.h | 4 +- src/apps/codycam/VideoConsumer.cpp | 4 +- src/apps/deskbar/BarWindow.cpp | 4 +- src/apps/deskbar/DeskbarMenu.cpp | 4 +- src/apps/deskbar/PreferencesWindow.cpp | 4 +- src/apps/deskbar/StatusView.cpp | 4 +- src/apps/deskbar/TimeView.cpp | 4 +- src/apps/deskbar/WindowMenu.cpp | 4 +- src/apps/deskcalc/CalcApplication.cpp | 4 +- src/apps/deskcalc/CalcView.cpp | 4 +- src/apps/deskcalc/CalcWindow.cpp | 4 +- src/apps/devices/Device.cpp | 4 +- src/apps/devices/DeviceACPI.cpp | 4 +- src/apps/devices/DevicePCI.cpp | 4 +- src/apps/devices/DeviceSCSI.cpp | 4 +- src/apps/devices/DevicesApplication.cpp | 4 +- src/apps/devices/DevicesView.cpp | 4 +- src/apps/devices/PropertyList.cpp | 4 +- src/apps/devices/ResourceUsageWindow.cpp | 4 +- src/apps/diskprobe/AttributeWindow.cpp | 4 +- src/apps/diskprobe/DiskProbe.cpp | 4 +- src/apps/diskprobe/FileWindow.cpp | 4 +- src/apps/diskprobe/FindWindow.cpp | 4 +- src/apps/diskprobe/OpenWindow.cpp | 4 +- src/apps/diskprobe/ProbeView.cpp | 4 +- src/apps/diskprobe/TypeEditors.cpp | 4 +- src/apps/diskusage/DiskUsage.cpp | 4 +- src/apps/diskusage/InfoWindow.cpp | 4 +- src/apps/diskusage/MainWindow.cpp | 4 +- src/apps/diskusage/PieView.cpp | 4 +- src/apps/diskusage/Scanner.cpp | 4 +- src/apps/diskusage/StatusView.cpp | 4 +- src/apps/diskusage/VolumeView.cpp | 4 +- src/apps/drivesetup/CreateParamsPanel.cpp | 4 +- src/apps/drivesetup/DiskView.cpp | 4 +- src/apps/drivesetup/InitParamsPanel.cpp | 4 +- src/apps/drivesetup/MainWindow.cpp | 4 +- src/apps/drivesetup/PartitionList.cpp | 4 +- src/apps/drivesetup/Support.cpp | 4 +- src/apps/expander/DirectoryFilePanel.cpp | 4 +- src/apps/expander/ExpanderPreferences.cpp | 4 +- src/apps/expander/ExpanderWindow.cpp | 12 +++--- src/apps/fontdemo/ControlView.cpp | 4 +- src/apps/fontdemo/FontDemo.cpp | 4 +- src/apps/fontdemo/FontDemoView.cpp | 4 +- src/apps/glteapot/ObjectView.cpp | 4 +- src/apps/glteapot/TeapotWindow.cpp | 4 +- src/apps/icon-o-matic/IconEditorApp.cpp | 4 +- src/apps/icon-o-matic/MainWindow.cpp | 40 +++++++++---------- .../document/SetPropertiesCommand.cpp | 8 ++-- .../panel/color_picker/ColorPickerPanel.cpp | 4 +- .../generic/property/CommonPropertyIDs.cpp | 4 +- .../property/view/PropertyListView.cpp | 4 +- .../icon-o-matic/gui/IconObjectListView.cpp | 10 ++--- src/apps/icon-o-matic/gui/PathListView.cpp | 4 +- src/apps/icon-o-matic/gui/SavePanel.cpp | 8 ++-- src/apps/icon-o-matic/gui/ShapeListView.cpp | 4 +- src/apps/icon-o-matic/gui/StyleListView.cpp | 4 +- src/apps/icon-o-matic/gui/StyleView.cpp | 4 +- .../icon-o-matic/gui/TransformerListView.cpp | 8 ++-- .../icon-o-matic/import_export/Exporter.cpp | 6 +-- .../styled_text/StyledTextImporter.cpp | 4 +- .../import_export/svg/SVGExporter.cpp | 4 +- .../import_export/svg/SVGImporter.cpp | 4 +- .../icon-o-matic/shape/PathManipulator.cpp | 4 +- .../shape/commands/AddPathsCommand.cpp | 4 +- .../shape/commands/AddPointCommand.cpp | 4 +- .../shape/commands/AddShapesCommand.cpp | 4 +- .../shape/commands/AddTransformersCommand.cpp | 4 +- .../shape/commands/ChangePointCommand.cpp | 4 +- .../shape/commands/CleanUpPathCommand.cpp | 4 +- .../shape/commands/FlipPointsCommand.cpp | 4 +- .../commands/FreezeTransformationCommand.cpp | 4 +- .../shape/commands/InsertPointCommand.cpp | 4 +- .../shape/commands/MovePathsCommand.cpp | 4 +- .../shape/commands/MoveShapesCommand.cpp | 4 +- .../commands/MoveTransformersCommand.cpp | 4 +- .../shape/commands/NudgePointsCommand.cpp | 4 +- .../shape/commands/PathCommand.cpp | 4 +- .../shape/commands/RemovePathsCommand.cpp | 4 +- .../shape/commands/RemovePointsCommand.cpp | 4 +- .../shape/commands/RemoveShapesCommand.cpp | 4 +- .../commands/RemoveTransformersCommand.cpp | 4 +- .../shape/commands/ReversePathCommand.cpp | 4 +- .../commands/RotatePathIndicesCommand.cpp | 4 +- .../shape/commands/SplitPointsCommand.cpp | 4 +- .../shape/commands/UnassignPathCommand.cpp | 4 +- .../icon-o-matic/style/AddStylesCommand.cpp | 4 +- .../icon-o-matic/style/AssignStyleCommand.cpp | 4 +- .../icon-o-matic/style/MoveStylesCommand.cpp | 4 +- .../style/RemoveStylesCommand.cpp | 4 +- .../icon-o-matic/style/SetColorCommand.cpp | 4 +- .../icon-o-matic/style/SetGradientCommand.cpp | 4 +- .../ResetTransformationCommand.cpp | 4 +- .../transformable/TransformBoxStates.cpp | 4 +- src/apps/installedpackages/UninstallView.cpp | 4 +- .../installedpackages/UninstallWindow.cpp | 4 +- src/apps/installedpackages/main.cpp | 4 +- src/apps/installer/InstallerApp.cpp | 4 +- src/apps/installer/InstallerWindow.cpp | 4 +- src/apps/installer/PackageViews.cpp | 4 +- src/apps/installer/ProgressReporter.cpp | 4 +- src/apps/installer/WorkerThread.cpp | 2 +- src/apps/launchbox/App.cpp | 4 +- src/apps/launchbox/LaunchButton.cpp | 4 +- src/apps/launchbox/MainWindow.cpp | 4 +- src/apps/launchbox/NamePanel.cpp | 4 +- src/apps/launchbox/PadView.cpp | 4 +- src/apps/login/DesktopWindow.cpp | 4 +- src/apps/login/LoginApp.cpp | 4 +- src/apps/login/LoginView.cpp | 4 +- src/apps/login/LoginWindow.cpp | 4 +- src/apps/magnify/Magnify.cpp | 22 +++++----- src/apps/mail/Content.cpp | 2 +- src/apps/mail/Enclosures.cpp | 2 +- src/apps/mail/Enclosures.h | 2 +- src/apps/mail/FindWindow.cpp | 2 +- src/apps/mail/Header.cpp | 2 +- src/apps/mail/MailApp.cpp | 2 +- src/apps/mail/MailPopUpMenu.cpp | 2 +- src/apps/mail/MailWindow.cpp | 2 +- src/apps/mail/Prefs.cpp | 2 +- src/apps/mail/Settings.cpp | 2 +- src/apps/mail/Signature.cpp | 2 +- src/apps/mandelbrot/Mandelbrot.cpp | 4 +- src/apps/mediaconverter/MediaConverterApp.cpp | 4 +- .../mediaconverter/MediaConverterWindow.cpp | 18 ++++----- .../mediaconverter/MediaEncoderWindow.cpp | 4 +- src/apps/mediaconverter/MediaFileInfo.cpp | 4 +- src/apps/mediaconverter/MediaFileInfoView.cpp | 4 +- src/apps/mediaplayer/InfoWin.cpp | 4 +- src/apps/mediaplayer/MainApp.cpp | 4 +- src/apps/mediaplayer/MainWin.cpp | 14 +++---- src/apps/mediaplayer/interface/PeakView.cpp | 4 +- .../playlist/CopyPLItemsCommand.cpp | 4 +- .../playlist/ImportPLItemsCommand.cpp | 4 +- .../playlist/MovePLItemsCommand.cpp | 4 +- .../mediaplayer/playlist/PlaylistItem.cpp | 12 +++--- .../mediaplayer/playlist/PlaylistWindow.cpp | 4 +- .../playlist/RandomizePLItemsCommand.cpp | 4 +- .../playlist/RemovePLItemsCommand.cpp | 4 +- .../mediaplayer/settings/SettingsWindow.cpp | 4 +- src/apps/midiplayer/MidiPlayerApp.cpp | 4 +- src/apps/midiplayer/MidiPlayerWindow.cpp | 4 +- src/apps/midiplayer/ScopeView.cpp | 4 +- src/apps/networkstatus/NetworkStatus.cpp | 4 +- src/apps/networkstatus/NetworkStatusView.cpp | 4 +- .../networkstatus/NetworkStatusWindow.cpp | 4 +- src/apps/overlayimage/OverlayView.cpp | 4 +- src/apps/overlayimage/OverlayWindow.cpp | 4 +- .../packageinstaller/PackageImageViewer.cpp | 4 +- src/apps/packageinstaller/PackageInfo.cpp | 4 +- src/apps/packageinstaller/PackageInstall.cpp | 4 +- src/apps/packageinstaller/PackageItem.cpp | 4 +- src/apps/packageinstaller/PackageStatus.cpp | 4 +- .../packageinstaller/PackageTextViewer.cpp | 4 +- src/apps/packageinstaller/PackageView.cpp | 4 +- src/apps/packageinstaller/PackageWindow.cpp | 4 +- src/apps/packageinstaller/main.cpp | 4 +- src/apps/packagemanager/PackageManager.cpp | 4 +- src/apps/pairs/PairsView.cpp | 4 +- src/apps/pairs/PairsWindow.cpp | 4 +- src/apps/people/AttributeTextControl.cpp | 4 +- src/apps/people/PeopleApp.cpp | 8 ++-- src/apps/people/PersonView.cpp | 6 +-- src/apps/people/PersonWindow.cpp | 4 +- src/apps/people/PictureView.cpp | 4 +- src/apps/poorman/PoorManAdvancedView.cpp | 4 +- src/apps/poorman/PoorManLoggingView.cpp | 4 +- src/apps/poorman/PoorManPreferencesWindow.cpp | 4 +- src/apps/poorman/PoorManWindow.cpp | 4 +- src/apps/poorman/constants.cpp | 4 +- src/apps/powerstatus/ExtendedInfoWindow.cpp | 4 +- src/apps/powerstatus/PowerStatus.cpp | 4 +- src/apps/powerstatus/PowerStatusView.cpp | 4 +- .../KernelMemoryBarMenuItem.cpp | 4 +- .../processcontroller/NoiseBarMenuItem.cpp | 4 +- src/apps/processcontroller/PCWorld.cpp | 4 +- src/apps/processcontroller/Preferences.cpp | 4 +- src/apps/processcontroller/PriorityMenu.cpp | 4 +- .../processcontroller/ProcessController.cpp | 4 +- src/apps/pulse/CPUButton.cpp | 4 +- src/apps/pulse/ConfigView.cpp | 4 +- src/apps/pulse/DeskbarPulseView.cpp | 4 +- src/apps/pulse/MiniPulseView.cpp | 4 +- src/apps/pulse/NormalPulseView.cpp | 4 +- src/apps/pulse/PrefsWindow.cpp | 4 +- src/apps/pulse/PulseApp.cpp | 4 +- src/apps/pulse/PulseView.cpp | 4 +- src/apps/pulse/PulseWindow.cpp | 4 +- .../readonlybootprompt/BootPromptWindow.cpp | 4 +- src/apps/screenshot/Screenshot.cpp | 4 +- src/apps/screenshot/ScreenshotWindow.cpp | 4 +- src/apps/screenshot/Utility.cpp | 4 +- src/apps/showimage/PrintOptionsWindow.cpp | 4 +- src/apps/showimage/ProgressWindow.cpp | 4 +- src/apps/showimage/ShowImageView.cpp | 4 +- src/apps/showimage/ShowImageWindow.cpp | 14 +++---- src/apps/soundrecorder/RecorderWindow.cpp | 4 +- src/apps/soundrecorder/SoundListView.cpp | 4 +- src/apps/stylededit/FindWindow.cpp | 4 +- src/apps/stylededit/ReplaceWindow.cpp | 4 +- src/apps/stylededit/StyledEditApp.cpp | 4 +- src/apps/stylededit/StyledEditWindow.cpp | 40 +++++++++---------- src/apps/sudoku/ProgressWindow.cpp | 4 +- src/apps/sudoku/Sudoku.cpp | 4 +- src/apps/sudoku/SudokuGenerator.cpp | 4 +- src/apps/sudoku/SudokuWindow.cpp | 4 +- src/apps/switcher/LaunchButton.cpp | 4 +- src/apps/switcher/Switcher.cpp | 4 +- src/apps/terminal/AppearPrefView.cpp | 4 +- src/apps/terminal/Arguments.cpp | 4 +- src/apps/terminal/Colors.cpp | 4 +- src/apps/terminal/FindWindow.cpp | 4 +- src/apps/terminal/PrefHandler.cpp | 8 ++-- src/apps/terminal/PrefWindow.cpp | 4 +- src/apps/terminal/SetTitleDialog.cpp | 4 +- src/apps/terminal/Shell.cpp | 4 +- src/apps/terminal/TermApp.cpp | 4 +- src/apps/terminal/TermConst.cpp | 4 +- src/apps/terminal/TermView.cpp | 4 +- src/apps/terminal/TermWindow.cpp | 4 +- src/apps/text_search/GrepWindow.cpp | 4 +- src/apps/text_search/Grepper.cpp | 4 +- src/apps/tv/MainApp.cpp | 4 +- src/apps/tv/MainWin.cpp | 4 +- src/apps/webwatch/WatchView.cpp | 4 +- src/apps/workspaces/Workspaces.cpp | 4 +- src/bin/desklink/DeskButton.cpp | 4 +- src/bin/desklink/MediaReplicant.cpp | 4 +- src/bin/desklink/VolumeControl.cpp | 4 +- src/bin/dstcheck.cpp | 4 +- src/bin/filepanel.cpp | 4 +- src/bin/screen_blanker/PasswordWindow.cpp | 4 +- src/kits/bluetooth/DeviceClass.cpp | 4 +- src/kits/bluetooth/RemoteDevice.cpp | 4 +- src/kits/interface/ColorControl.cpp | 4 +- src/kits/interface/Dragger.cpp | 4 +- src/kits/interface/Menu.cpp | 4 +- src/kits/interface/PrintJob.cpp | 4 +- src/kits/interface/TextView.cpp | 4 +- src/kits/interface/ZombieReplicantView.cpp | 4 +- src/kits/mail/FileConfigView.cpp | 4 +- src/kits/mail/ProtocolConfigView.cpp | 4 +- src/kits/shared/AboutMenuItem.cpp | 4 +- src/kits/shared/AboutWindow.cpp | 4 +- src/kits/shared/StringForSize.cpp | 14 +++---- src/kits/textencoding/character_sets.cpp | 4 +- src/kits/tracker/AutoMounterSettings.cpp | 4 +- src/kits/tracker/ContainerWindow.cpp | 4 +- src/kits/tracker/CountView.cpp | 4 +- src/kits/tracker/DeskWindow.cpp | 4 +- src/kits/tracker/DirMenu.cpp | 4 +- src/kits/tracker/FSClipboard.cpp | 4 +- src/kits/tracker/FSUtils.cpp | 4 +- src/kits/tracker/FavoritesMenu.cpp | 4 +- src/kits/tracker/FilePanelPriv.cpp | 4 +- src/kits/tracker/FilePermissionsView.cpp | 4 +- src/kits/tracker/FindPanel.cpp | 4 +- src/kits/tracker/InfoWindow.cpp | 4 +- src/kits/tracker/Model.cpp | 4 +- src/kits/tracker/MountMenu.cpp | 4 +- src/kits/tracker/NavMenu.cpp | 4 +- src/kits/tracker/OpenWithWindow.cpp | 4 +- src/kits/tracker/PoseView.cpp | 4 +- src/kits/tracker/QueryContainerWindow.cpp | 4 +- src/kits/tracker/QueryPoseView.cpp | 4 +- src/kits/tracker/SelectionWindow.cpp | 4 +- src/kits/tracker/SettingsViews.cpp | 4 +- src/kits/tracker/SlowContextPopup.cpp | 4 +- src/kits/tracker/StatusWindow.cpp | 4 +- src/kits/tracker/TemplatesMenu.cpp | 4 +- src/kits/tracker/TextWidget.cpp | 4 +- src/kits/tracker/Tracker.cpp | 4 +- src/kits/tracker/TrackerInitialState.cpp | 4 +- src/kits/tracker/TrackerSettingsWindow.cpp | 4 +- src/kits/tracker/VolumeWindow.cpp | 4 +- src/kits/tracker/WidgetAttributeText.cpp | 4 +- .../icon/transformer/TransformerFactory.cpp | 4 +- src/preferences/appearance/APRView.cpp | 4 +- src/preferences/appearance/APRWindow.cpp | 4 +- .../appearance/AntialiasingSettingsView.cpp | 4 +- src/preferences/appearance/ColorSet.cpp | 4 +- .../appearance/DecorSettingsView.cpp | 4 +- .../appearance/FontSelectionView.cpp | 4 +- src/preferences/appearance/FontView.cpp | 4 +- src/preferences/backgrounds/Backgrounds.cpp | 4 +- .../backgrounds/BackgroundsView.cpp | 4 +- .../backgrounds/ImageFilePanel.cpp | 4 +- .../bluetooth/BluetoothDeviceView.cpp | 4 +- src/preferences/bluetooth/BluetoothMain.cpp | 4 +- .../bluetooth/BluetoothSettingsView.cpp | 4 +- src/preferences/bluetooth/BluetoothWindow.cpp | 4 +- .../bluetooth/ExtendedLocalDeviceView.cpp | 4 +- src/preferences/bluetooth/InquiryPanel.cpp | 4 +- .../bluetooth/RemoteDevicesView.cpp | 4 +- .../cpufrequency/CPUFrequencyView.cpp | 4 +- .../cpufrequency/ColorStepView.cpp | 4 +- .../cpufrequency/PreferencesWindow.h | 6 +-- src/preferences/cpufrequency/StatusView.cpp | 4 +- src/preferences/cpufrequency/main.cpp | 4 +- .../datatranslations/DataTranslations.cpp | 4 +- .../DataTranslationsWindow.cpp | 4 +- .../filetypes/ApplicationTypeWindow.cpp | 4 +- .../filetypes/ApplicationTypesWindow.cpp | 4 +- src/preferences/filetypes/AttributeWindow.cpp | 4 +- src/preferences/filetypes/ExtensionWindow.cpp | 4 +- src/preferences/filetypes/FileTypeWindow.cpp | 4 +- src/preferences/filetypes/FileTypes.cpp | 4 +- src/preferences/filetypes/FileTypesWindow.cpp | 4 +- src/preferences/filetypes/IconView.cpp | 4 +- .../filetypes/NewFileTypeWindow.cpp | 4 +- .../filetypes/PreferredAppMenu.cpp | 4 +- src/preferences/filetypes/TypeListWindow.cpp | 4 +- src/preferences/fonts/FontSelectionView.cpp | 4 +- src/preferences/fonts/FontView.cpp | 4 +- src/preferences/fonts/MainWindow.cpp | 4 +- src/preferences/fonts/main.cpp | 4 +- src/preferences/keyboard/Keyboard.cpp | 4 +- src/preferences/keyboard/KeyboardView.cpp | 4 +- src/preferences/keyboard/KeyboardWindow.cpp | 4 +- src/preferences/keymap/KeymapWindow.cpp | 4 +- src/preferences/keymap/ModifierKeysWindow.cpp | 4 +- src/preferences/locale/FormatSettingsView.cpp | 4 +- src/preferences/locale/LanguageListView.cpp | 4 +- src/preferences/locale/LocalePreflet.cpp | 4 +- src/preferences/locale/LocaleWindow.cpp | 4 +- src/preferences/mail/AutoConfigView.cpp | 4 +- src/preferences/mail/AutoConfigWindow.cpp | 4 +- src/preferences/mail/ConfigViews.cpp | 4 +- src/preferences/mail/ConfigWindow.cpp | 4 +- src/preferences/mail/FilterConfigView.cpp | 4 +- src/preferences/media/MediaViews.cpp | 4 +- src/preferences/media/MediaWindow.cpp | 4 +- src/preferences/mouse/Mouse.cpp | 4 +- src/preferences/mouse/MouseWindow.cpp | 4 +- src/preferences/mouse/SettingsView.cpp | 4 +- .../network/EthernetSettingsView.cpp | 4 +- src/preferences/network/NetworkWindow.cpp | 4 +- src/preferences/notifications/DisplayView.cpp | 4 +- src/preferences/notifications/GeneralView.cpp | 4 +- .../notifications/NotificationsView.cpp | 4 +- src/preferences/notifications/PrefletView.cpp | 4 +- src/preferences/notifications/PrefletWin.cpp | 4 +- src/preferences/printers/AddPrinterDialog.cpp | 4 +- src/preferences/printers/JobListView.cpp | 4 +- src/preferences/printers/PrinterListView.cpp | 4 +- src/preferences/printers/PrintersWindow.cpp | 4 +- src/preferences/printers/TestPageView.cpp | 4 +- src/preferences/printers/TransportMenu.cpp | 4 +- src/preferences/screen/AlertView.cpp | 4 +- src/preferences/screen/AlertWindow.cpp | 4 +- src/preferences/screen/MonitorView.cpp | 4 +- src/preferences/screen/RefreshSlider.cpp | 4 +- src/preferences/screen/RefreshWindow.cpp | 4 +- src/preferences/screen/ScreenApplication.cpp | 4 +- src/preferences/screen/ScreenWindow.cpp | 4 +- .../screensaver/PasswordWindow.cpp | 4 +- .../screensaver/ScreenSaverWindow.cpp | 4 +- src/preferences/shortcuts/ShortcutsApp.cpp | 4 +- src/preferences/shortcuts/ShortcutsSpec.cpp | 4 +- src/preferences/shortcuts/ShortcutsWindow.cpp | 4 +- src/preferences/sounds/HApp.cpp | 4 +- src/preferences/sounds/HEventList.cpp | 4 +- src/preferences/sounds/HWindow.cpp | 4 +- src/preferences/time/DateTimeView.cpp | 4 +- src/preferences/time/NetworkTimeView.cpp | 4 +- src/preferences/time/Time.cpp | 4 +- src/preferences/time/TimeWindow.cpp | 4 +- src/preferences/time/ZoneView.cpp | 4 +- src/preferences/time/ntp.cpp | 4 +- src/preferences/touchpad/TouchpadPrefView.cpp | 4 +- src/preferences/touchpad/main.cpp | 4 +- .../virtualmemory/SettingsWindow.cpp | 4 +- .../virtualmemory/VirtualMemory.cpp | 4 +- src/servers/debug/DebugServer.cpp | 4 +- src/servers/mail/DeskbarView.cpp | 4 +- src/servers/mail/MailDaemon.cpp | 4 +- src/servers/mail/Notifier.cpp | 4 +- src/servers/mount/AutoMounter.cpp | 4 +- .../notification/NotificationWindow.cpp | 4 +- src/servers/print/ConfigWindow.cpp | 4 +- src/servers/print/PrintServerApp.R5.cpp | 4 +- .../print/PrintServerApp.Scripting.cpp | 4 +- src/servers/print/PrintServerApp.cpp | 4 +- src/servers/print/Printer.Scripting.cpp | 4 +- src/servers/print/Transport.Scripting.cpp | 4 +- src/servers/registrar/ShutdownProcess.cpp | 4 +- src/servers/syslog_daemon/SyslogDaemon.cpp | 4 +- src/tests/kits/game/chart/Chart.cpp | 4 +- src/tests/kits/game/chart/ChartWindow.cpp | 4 +- src/tests/kits/locale/catalogSpeed.cpp | 4 +- src/tests/kits/locale/catalogTest.cpp | 17 ++++---- src/tests/kits/locale/catalogTestAddOn.cpp | 35 +++++++++------- .../InterfacesAddOn/InterfaceWindow.cpp | 4 +- .../kits/net/preflet/NetworkSetupWindow.cpp | 4 +- .../kits/opengl/glinfo/CapabilitiesView.cpp | 4 +- .../kits/opengl/glinfo/ExtensionsView.cpp | 4 +- src/tests/kits/opengl/glinfo/InfoView.cpp | 4 +- src/tests/kits/opengl/glinfo/OpenGLView.cpp | 4 +- src/tests/kits/opengl/glinfo/OpenGLWindow.cpp | 4 +- .../inspector/ActiveTranslatorsWindow.cpp | 4 +- src/tools/translation/inspector/ImageView.cpp | 4 +- .../translation/inspector/ImageWindow.cpp | 4 +- .../translation/inspector/InspectorApp.cpp | 4 +- 521 files changed, 1171 insertions(+), 1165 deletions(-) diff --git a/docs/develop/makefile-engine.html b/docs/develop/makefile-engine.html index 0df205eadd..923255ed99 100644 --- a/docs/develop/makefile-engine.html +++ b/docs/develop/makefile-engine.html @@ -166,8 +166,8 @@ engine, last line must contain:

#include <stdio.h>
 #include <Catalog.h>
 
-#undef B_TRANSLATE_CONTEXT
-#ifdef B_TRANSLATE_CONTEXT "hello"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "hello"
 
 int main(void)
 {
diff --git a/docs/user/locale/Catalog.dox b/docs/user/locale/Catalog.dox
index 94d532e488..37948bd72e 100644
--- a/docs/user/locale/Catalog.dox
+++ b/docs/user/locale/Catalog.dox
@@ -41,7 +41,7 @@
 
 	\section macros Using the macros
 	You don't have to do much in your program to handle catalogs. You must
-	first set the B_TRANSLATE_CONTEXT define to a string that identifies which
+	first set the B_TRANSLATION_CONTEXT define to a string that identifies which
 	part of the application the strings you will translate are in. This allows
 	the translators to keep track of the strings in the catalog more easily,
 	and find where they are visible in the application. then, all you have to
diff --git a/headers/os/locale/Catalog.h b/headers/os/locale/Catalog.h
index c716016aed..17f6653b90 100644
--- a/headers/os/locale/Catalog.h
+++ b/headers/os/locale/Catalog.h
@@ -59,8 +59,8 @@ private:
 };
 
 
-#undef B_TRANSLATE_SYSTEM_NAME_CONTEXT
-#define B_TRANSLATE_SYSTEM_NAME_CONTEXT "System name"
+#undef B_TRANSLATION_SYSTEM_NAME_CONTEXT
+#define B_TRANSLATION_SYSTEM_NAME_CONTEXT "System name"
 
 
 #ifndef B_AVOID_TRANSLATION_MACROS
@@ -68,9 +68,7 @@ private:
 // you don't want these (in which case you need to collect the catalog keys
 // manually, as collectcatkeys won't do it for you):
 
-// TODO: maybe rename this to B_TRANSLATE_DEFAULT_CONTEXT, so that
-// B_TRANSLATE_WITH_CONTEXT() can just be called B_TRANSLATE_CONTEXT()
-#undef B_TRANSLATE_CONTEXT
+#undef B_TRANSLATION_CONTEXT
 	// In a single application, several strings (e.g. 'Ok') will be used
 	// more than once, in different contexts.
 	// As the application programmer can not know if all translations of
@@ -81,10 +79,10 @@ private:
 	// same string and tell which strings appears in what context of the
 	// application.
 	// In order to give the translator a useful hint, the application
-	// programmer needs to define B_TRANSLATE_CONTEXT with the context he'd
+	// programmer needs to define B_TRANSLATION_CONTEXT with the context he'd
 	// like to be associated with the strings used in this specifc source file.
 	// example:
-	//		#define B_TRANSLATE_CONTEXT "Folder-Window"
+	//		#define B_TRANSLATION_CONTEXT "Folder-Window"
 	// Tip: Use a descriptive name of the class implemented in that
 	//		source-file.
 
@@ -92,16 +90,16 @@ private:
 #undef B_TRANSLATE
 #define B_TRANSLATE(string) \
 	BLocaleRoster::Default()->GetCatalog()->GetString((string), \
-		B_TRANSLATE_CONTEXT)
+		B_TRANSLATION_CONTEXT)
 
-#undef B_TRANSLATE_WITH_CONTEXT
-#define B_TRANSLATE_WITH_CONTEXT(string, context) \
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT(string, context) \
 	BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
 
 #undef B_TRANSLATE_COMMENT
 #define B_TRANSLATE_COMMENT(string, comment) \
 	BLocaleRoster::Default()->GetCatalog()->GetString((string), \
-		B_TRANSLATE_CONTEXT, (comment))
+		B_TRANSLATION_CONTEXT, (comment))
 
 #undef B_TRANSLATE_ALL
 #define B_TRANSLATE_ALL(string, context, comment) \
@@ -116,13 +114,13 @@ private:
 #define B_TRANSLATE_SYSTEM_NAME(string) \
 	BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
 		? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
-			B_TRANSLATE_SYSTEM_NAME_CONTEXT) \
+			B_TRANSLATION_SYSTEM_NAME_CONTEXT) \
 		: (string)
 
 // Translation markers which can be used to mark static strings/IDs which
 // are used as key for translation requests (at other places in the code).
 /* Example:
-		#define B_TRANSLATE_CONTEXT "MyDecentApp-Menu"
+		#define B_TRANSLATION_CONTEXT "MyDecentApp-Menu"
 
 		static const char* choices[] = {
 			B_TRANSLATE_MARK("left"),
diff --git a/headers/private/locale/collecting/Catalog.h b/headers/private/locale/collecting/Catalog.h
index ac17b52d60..53db39c086 100644
--- a/headers/private/locale/collecting/Catalog.h
+++ b/headers/private/locale/collecting/Catalog.h
@@ -2,27 +2,27 @@
  * Copyright 2012, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _CATALOG_COLLECTOR_H_
-#define _CATALOG_COLLECTOR_H_
+#ifndef _COLLECTING_CATALOG_H_
+#define _COLLECTING_CATALOG_H_
 
 
 #include_next 
 
 
 // Translation macros used when executing collectcatkeys
-#undef B_TRANSLATE_CONTEXT
+#undef B_TRANSLATION_CONTEXT
 
 #undef B_TRANSLATE
 #define B_TRANSLATE(string) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT)
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
 
-#undef B_TRANSLATE_WITH_CONTEXT
-#define B_TRANSLATE_WITH_CONTEXT(string, context) \
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT(string, context) \
 	B_CATKEY((string), (context))
 
 #undef B_TRANSLATE_COMMENT
 #define B_TRANSLATE_COMMENT(string, comment) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
 
 #undef B_TRANSLATE_ALL
 #define B_TRANSLATE_ALL(string, context, comment) \
@@ -34,15 +34,15 @@
 
 #undef B_TRANSLATE_SYSTEM_NAME
 #define B_TRANSLATE_SYSTEM_NAME(string) \
-	B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT)
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT)
 
 #undef B_TRANSLATE_MARK
 #define B_TRANSLATE_MARK(string) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT)
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
 
 #undef B_TRANSLATE_MARK_COMMENT
 #define B_TRANSLATE_MARK_COMMENT(string, comment) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
 
 #undef B_TRANSLATE_MARK_ALL
 #define B_TRANSLATE_MARK_ALL(string, context, comment) \
@@ -54,15 +54,15 @@
 
 #undef B_TRANSLATE_MARK_SYSTEM_NAME
 #define B_TRANSLATE_MARK_SYSTEM_NAME(string) \
-	B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
 
 #undef B_TRANSLATE_MARK_VOID
 #define B_TRANSLATE_MARK_VOID(string) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT)
+	B_CATKEY((string), B_TRANSLATION_CONTEXT)
 
 #undef B_TRANSLATE_MARK_COMMENT_VOID
 #define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
-	B_CATKEY((string), B_TRANSLATE_CONTEXT, (comment))
+	B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
 
 #undef B_TRANSLATE_MARK_ALL_VOID
 #define B_TRANSLATE_MARK_ALL_VOID(string, context, comment) \
@@ -74,7 +74,7 @@
 
 #undef B_TRANSLATE_MARK_SYSTEM_NAME_VOID
 #define B_TRANSLATE_MARK_SYSTEM_NAME_VOID(string) \
-	B_CATKEY((string), B_TRANSLATE_SYSTEM_NAME_CONTEXT, "")
+	B_CATKEY((string), B_TRANSLATION_SYSTEM_NAME_CONTEXT, "")
 
 #undef B_TRANSLATE_NOCOLLECT
 #define B_TRANSLATE_NOCOLLECT(string)
@@ -92,4 +92,4 @@
 #define B_TRANSLATE_NOCOLLECT_SYSTEM_NAME(string)
 
 
-#endif /* _CATALOG_COLLECTOR_H_ */
+#endif /* _COLLECTING_CATALOG_H_ */
diff --git a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
index 0fd254874b..50e12534af 100644
--- a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
+++ b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
@@ -24,8 +24,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BFS_Initialize_Parameter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BFS_Initialize_Parameter"
 
 
 static uint32 MSG_BLOCK_SIZE = 'blsz';
diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp b/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
index 09f8811c18..8d0c963692 100644
--- a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
+++ b/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
@@ -12,8 +12,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BFS_Creation_Parameter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BFS_Creation_Parameter"
 
 
 PrimaryPartitionEditor::PrimaryPartitionEditor()
diff --git a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
index 2f1ae027dc..03ddd51ec7 100644
--- a/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
+++ b/src/add-ons/input_server/devices/keyboard/TeamMonitorWindow.cpp
@@ -35,8 +35,8 @@
 #include "TeamListItem.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Team monitor"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Team monitor"
 
 
 TeamMonitorWindow* gTeamMonitorWindow = NULL;
diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp b/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
index 5d622b7b61..03e8487ebf 100644
--- a/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 const uint32 kMsgActionMoveTo = 'argm';
diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/RuleFilter.cpp b/src/add-ons/mail_daemon/inbound_filters/match_header/RuleFilter.cpp
index 686e7d4239..512a00247c 100644
--- a/src/add-ons/mail_daemon/inbound_filters/match_header/RuleFilter.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/match_header/RuleFilter.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RuleFilter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RuleFilter"
 
 
 RuleFilter::RuleFilter(MailProtocol& protocol, AddonSettings* addonSettings)
diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp b/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp
index 0b6485b312..fa9e8fcab2 100644
--- a/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/notifier/ConfigView.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 const uint32 kMsgNotifyMethod = 'nomt';
diff --git a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp b/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp
index b22f8ff298..4e3311685b 100644
--- a/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp
@@ -18,8 +18,8 @@
 #include "ConfigView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "filter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "filter"
 
 
 class NotifyFilter : public MailFilter
diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
index 615db89700..0a55b77ac0 100644
--- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp
@@ -129,8 +129,8 @@
 #include "SpamFilter.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SpamFilter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SpamFilter"
 
 
 // The names match the ones set up by spamdbm for sound effects.
diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
index 3592548504..253134dd12 100644
--- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
+++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp
@@ -95,8 +95,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SpamFilterConfig"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SpamFilterConfig"
 
 
 static const char *kServerSignature = "application/x-vnd.agmsmith.spamdbm";
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolderConfig.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolderConfig.cpp
index 214730d1c8..e6180ffa5c 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolderConfig.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPFolderConfig.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "IMAPFolderConfig"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "IMAPFolderConfig"
 
 
 class EditableListItem {
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp
index b5128c0914..2a22ed76c5 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_config.cpp
@@ -21,8 +21,8 @@
 #include "IMAPFolderConfig.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "imap_config"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "imap_config"
 
 
 const uint32 kMsgOpenIMAPFolder = '&OIF';
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/ConfigView.cpp b/src/add-ons/mail_daemon/inbound_protocols/pop3/ConfigView.cpp
index 640e00f0a2..312804bc61 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/ConfigView.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 class POP3ConfigView : public BMailProtocolConfigView {
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
index c8c773dec8..83f27445c4 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
@@ -44,8 +44,8 @@
 #include "MessageIO.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "pop3"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "pop3"
 
 
 static void NotHere(BStringList &that, BStringList &otherList,
diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp b/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
index 0db4fc4c0e..be7d4bd86a 100644
--- a/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/outbound_filters/fortune/ConfigView.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView()
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
index 083bea1402..6024b56eb2 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 class SMTPConfigView : public BMailProtocolConfigView {
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
index c13b8048e2..67ee55a2af 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
@@ -48,8 +48,8 @@
 #endif
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "smtp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "smtp"
 
 
 #define CRLF "\r\n"
diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
index a4f1882e80..b138573f55 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
@@ -29,8 +29,8 @@
 #include "MixerUtils.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AudioMixer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AudioMixer"
 
 
 // the range of the gain sliders (in dB)
diff --git a/src/add-ons/screen_savers/butterfly/Butterfly.cpp b/src/add-ons/screen_savers/butterfly/Butterfly.cpp
index 0407d414ae..e012bc2a7f 100644
--- a/src/add-ons/screen_savers/butterfly/Butterfly.cpp
+++ b/src/add-ons/screen_savers/butterfly/Butterfly.cpp
@@ -19,8 +19,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver Butterfly"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver Butterfly"
 
 
 extern "C" BScreenSaver*
diff --git a/src/add-ons/screen_savers/debugnow/DebugNow.cpp b/src/add-ons/screen_savers/debugnow/DebugNow.cpp
index f138d83baa..0d5d232b56 100644
--- a/src/add-ons/screen_savers/debugnow/DebugNow.cpp
+++ b/src/add-ons/screen_savers/debugnow/DebugNow.cpp
@@ -15,8 +15,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver DebugNow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver DebugNow"
 
 
 const rgb_color kMediumBlue = {0, 0, 100};
diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
index aa9e21dbaf..dcb5a0d307 100644
--- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
+++ b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
@@ -19,8 +19,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver Haiku"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver Haiku"
 
 
 class ScreenSaver : public BScreenSaver
diff --git a/src/add-ons/screen_savers/icons/IconsSaver.cpp b/src/add-ons/screen_savers/icons/IconsSaver.cpp
index 75bb7b1553..45c8127743 100644
--- a/src/add-ons/screen_savers/icons/IconsSaver.cpp
+++ b/src/add-ons/screen_savers/icons/IconsSaver.cpp
@@ -18,8 +18,8 @@
 
 #include "IconDisplay.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver Icons"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver Icons"
 
 
 #define MAX_ICONS 15
diff --git a/src/add-ons/screen_savers/ifs/IFSSaver.cpp b/src/add-ons/screen_savers/ifs/IFSSaver.cpp
index 106f1274fd..4f38ae944f 100644
--- a/src/add-ons/screen_savers/ifs/IFSSaver.cpp
+++ b/src/add-ons/screen_savers/ifs/IFSSaver.cpp
@@ -11,8 +11,8 @@
 
 #include "IFSSaver.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver IFS"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver IFS"
 
 
 enum {
diff --git a/src/add-ons/screen_savers/leaves/Leaves.cpp b/src/add-ons/screen_savers/leaves/Leaves.cpp
index 24823e84ea..c7b217f755 100644
--- a/src/add-ons/screen_savers/leaves/Leaves.cpp
+++ b/src/add-ons/screen_savers/leaves/Leaves.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Leaves"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Leaves"
 
 
 // path data for the leaf shape
diff --git a/src/add-ons/screen_savers/message/Message.cpp b/src/add-ons/screen_savers/message/Message.cpp
index 690eda3b02..f45643d430 100644
--- a/src/add-ons/screen_savers/message/Message.cpp
+++ b/src/add-ons/screen_savers/message/Message.cpp
@@ -24,8 +24,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver Message"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver Message"
 
 
 // Double brackets to satisfy a compiler warning
diff --git a/src/add-ons/screen_savers/spider/SpiderSaver.cpp b/src/add-ons/screen_savers/spider/SpiderSaver.cpp
index e4d638b805..a5e1261d63 100644
--- a/src/add-ons/screen_savers/spider/SpiderSaver.cpp
+++ b/src/add-ons/screen_savers/spider/SpiderSaver.cpp
@@ -24,8 +24,8 @@
 #include "Polygon.h"
 #include "PolygonQueue.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver Spider"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver Spider"
 
 enum {
 	MSG_QUEUE_NUMBER			= 'qunm',
diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
index ff314b63a7..254c311208 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp
@@ -17,8 +17,8 @@
 #include "ZipOMaticWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "file:ZipOMatic.cpp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "file:ZipOMatic.cpp"
 
 
 int
diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
index c073f39ca9..197550e018 100644
--- a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp
@@ -33,8 +33,8 @@
 #include "ZipperThread.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "file:ZipOMaticWindow.cpp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "file:ZipOMaticWindow.cpp"
 
 
 ZippoWindow::ZippoWindow(BList windowList, bool keepOpen)
diff --git a/src/add-ons/tracker/zipomatic/ZipperThread.cpp b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
index 71ae619a9e..fa9502d0d2 100644
--- a/src/add-ons/tracker/zipomatic/ZipperThread.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
@@ -27,8 +27,8 @@
 #include "ZipOMaticWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "file:ZipperThread.cpp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "file:ZipperThread.cpp"
 
 
 ZipperThread::ZipperThread(BMessage* refsMessage, BWindow* window)
diff --git a/src/add-ons/translators/bmp/BMPMain.cpp b/src/add-ons/translators/bmp/BMPMain.cpp
index 4aa01cbbdc..88d592da03 100644
--- a/src/add-ons/translators/bmp/BMPMain.cpp
+++ b/src/add-ons/translators/bmp/BMPMain.cpp
@@ -37,8 +37,8 @@
 #include "BMPTranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BMPMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BMPMain"
 
 
 // ---------------------------------------------------------------
diff --git a/src/add-ons/translators/bmp/BMPTranslator.cpp b/src/add-ons/translators/bmp/BMPTranslator.cpp
index cfd0840cd0..75f51d9ba6 100644
--- a/src/add-ons/translators/bmp/BMPTranslator.cpp
+++ b/src/add-ons/translators/bmp/BMPTranslator.cpp
@@ -28,8 +28,8 @@ using std::min;
 //#define ERROR(x) printf(x);
 #define ERROR(x)
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BMPTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BMPTranslator"
 
 
 // The input formats that this translator supports.
diff --git a/src/add-ons/translators/bmp/BMPView.cpp b/src/add-ons/translators/bmp/BMPView.cpp
index 5714a9c7ae..827e28a7e8 100644
--- a/src/add-ons/translators/bmp/BMPView.cpp
+++ b/src/add-ons/translators/bmp/BMPView.cpp
@@ -18,8 +18,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BMPView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BMPView"
 
 
 BMPView::BMPView(const BRect &frame, const char *name, uint32 resizeMode,
diff --git a/src/add-ons/translators/exr/ConfigView.cpp b/src/add-ons/translators/exr/ConfigView.cpp
index c2310cf36b..887218c303 100644
--- a/src/add-ons/translators/exr/ConfigView.cpp
+++ b/src/add-ons/translators/exr/ConfigView.cpp
@@ -19,8 +19,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView(uint32 flags)
diff --git a/src/add-ons/translators/exr/EXRTranslator.cpp b/src/add-ons/translators/exr/EXRTranslator.cpp
index dfc160c8d3..50b49c9364 100644
--- a/src/add-ons/translators/exr/EXRTranslator.cpp
+++ b/src/add-ons/translators/exr/EXRTranslator.cpp
@@ -16,8 +16,8 @@
 #include "ImfRgbaFile.h"
 #include "IStreamWrapper.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "EXRTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "EXRTranslator"
 
 
 // The input formats that this translator supports.
diff --git a/src/add-ons/translators/exr/main.cpp b/src/add-ons/translators/exr/main.cpp
index a943f4e12d..e4dd38d401 100644
--- a/src/add-ons/translators/exr/main.cpp
+++ b/src/add-ons/translators/exr/main.cpp
@@ -10,8 +10,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 int
 main(int /*argc*/, char **/*argv*/)
diff --git a/src/add-ons/translators/gif/GIFTranslator.cpp b/src/add-ons/translators/gif/GIFTranslator.cpp
index 21cc2f4e3b..2867e133d5 100644
--- a/src/add-ons/translators/gif/GIFTranslator.cpp
+++ b/src/add-ons/translators/gif/GIFTranslator.cpp
@@ -37,8 +37,8 @@
 #define GIF_TYPE 'GIF '
 #endif
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "GIFTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "GIFTranslator"
 
 
 // This global will be externed in other files - set once here
diff --git a/src/add-ons/translators/gif/GIFView.cpp b/src/add-ons/translators/gif/GIFView.cpp
index c10638f88e..fba85bd00a 100644
--- a/src/add-ons/translators/gif/GIFView.cpp
+++ b/src/add-ons/translators/gif/GIFView.cpp
@@ -31,8 +31,8 @@
 
 #include "GIFView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "GIFView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "GIFView"
 
 
 extern int32 translatorVersion;
diff --git a/src/add-ons/translators/hpgs/ConfigView.cpp b/src/add-ons/translators/hpgs/ConfigView.cpp
index 549718ed57..6a0083fd71 100644
--- a/src/add-ons/translators/hpgs/ConfigView.cpp
+++ b/src/add-ons/translators/hpgs/ConfigView.cpp
@@ -15,8 +15,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
diff --git a/src/add-ons/translators/hpgs/HPGSTranslator.cpp b/src/add-ons/translators/hpgs/HPGSTranslator.cpp
index 3b5cdae450..1261965728 100644
--- a/src/add-ons/translators/hpgs/HPGSTranslator.cpp
+++ b/src/add-ons/translators/hpgs/HPGSTranslator.cpp
@@ -18,8 +18,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HPGSTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HPGSTranslator"
 
 
 typedef struct my_hpgs_png_image_st {
diff --git a/src/add-ons/translators/hvif/HVIFMain.cpp b/src/add-ons/translators/hvif/HVIFMain.cpp
index aeccf14315..f034a5be67 100644
--- a/src/add-ons/translators/hvif/HVIFMain.cpp
+++ b/src/add-ons/translators/hvif/HVIFMain.cpp
@@ -11,8 +11,8 @@
 #include "HVIFTranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HVIFMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HVIFMain"
 
 int
 main(int argc, char *argv[])
diff --git a/src/add-ons/translators/hvif/HVIFTranslator.cpp b/src/add-ons/translators/hvif/HVIFTranslator.cpp
index 54c26573dc..486499f744 100644
--- a/src/add-ons/translators/hvif/HVIFTranslator.cpp
+++ b/src/add-ons/translators/hvif/HVIFTranslator.cpp
@@ -22,8 +22,8 @@
 #define HVIF_TRANSLATION_QUALITY		1.0
 #define HVIF_TRANSLATION_CAPABILITY		1.0
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HVIFTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HVIFTranslator"
 
 
 static const translation_format sInputFormats[] = {
diff --git a/src/add-ons/translators/hvif/HVIFView.cpp b/src/add-ons/translators/hvif/HVIFView.cpp
index 08c5558917..debc831449 100644
--- a/src/add-ons/translators/hvif/HVIFView.cpp
+++ b/src/add-ons/translators/hvif/HVIFView.cpp
@@ -18,8 +18,8 @@
 
 #define HVIF_SETTING_RENDER_SIZE_CHANGED	'rsch'
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HVIFView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HVIFView"
 
 
 HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings)
diff --git a/src/add-ons/translators/ico/ConfigView.cpp b/src/add-ons/translators/ico/ConfigView.cpp
index 8f93c4e5ef..3865cc1b73 100644
--- a/src/add-ons/translators/ico/ConfigView.cpp
+++ b/src/add-ons/translators/ico/ConfigView.cpp
@@ -16,8 +16,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView()
diff --git a/src/add-ons/translators/ico/ICOTranslator.cpp b/src/add-ons/translators/ico/ICOTranslator.cpp
index 50c937b3de..941049823c 100644
--- a/src/add-ons/translators/ico/ICOTranslator.cpp
+++ b/src/add-ons/translators/ico/ICOTranslator.cpp
@@ -17,8 +17,8 @@
 #include "ICO.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ICOTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ICOTranslator"
 
 
 const char *kDocumentCount = "/documentCount";
diff --git a/src/add-ons/translators/ico/main.cpp b/src/add-ons/translators/ico/main.cpp
index f633ce7480..4044bbec8b 100644
--- a/src/add-ons/translators/ico/main.cpp
+++ b/src/add-ons/translators/ico/main.cpp
@@ -11,8 +11,8 @@
 #include "ICO.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 int
 main(int /*argc*/, char ** /*argv*/)
diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.cpp b/src/add-ons/translators/jpeg/JPEGTranslator.cpp
index 36c5db5eb9..38f4d08e3e 100644
--- a/src/add-ons/translators/jpeg/JPEGTranslator.cpp
+++ b/src/add-ons/translators/jpeg/JPEGTranslator.cpp
@@ -43,8 +43,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "JPEGTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "JPEGTranslator"
 
 #define MARKER_EXIF	0xe1
 
diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.h b/src/add-ons/translators/jpeg/JPEGTranslator.h
index 8028fd55d2..eee87a3ff4 100644
--- a/src/add-ons/translators/jpeg/JPEGTranslator.h
+++ b/src/add-ons/translators/jpeg/JPEGTranslator.h
@@ -53,8 +53,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseTranslator.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "JPEGTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "JPEGTranslator"
 
 // Settings
 #define SETTINGS_FILE	"JPEGTranslator"
diff --git a/src/add-ons/translators/jpeg/be_jerror.cpp b/src/add-ons/translators/jpeg/be_jerror.cpp
index 41ed71f82b..fa5b8c29e5 100644
--- a/src/add-ons/translators/jpeg/be_jerror.cpp
+++ b/src/add-ons/translators/jpeg/be_jerror.cpp
@@ -51,8 +51,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "JPEGTranslator.h"
 #include "TranslatorSettings.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "be_jerror"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "be_jerror"
 
 // Since Translator doesn't use it's own error table, we can use error_mgr's
 // variables to store some usefull data.
diff --git a/src/add-ons/translators/jpeg/exif_parser.cpp b/src/add-ons/translators/jpeg/exif_parser.cpp
index 7ed838071a..6e73accde2 100644
--- a/src/add-ons/translators/jpeg/exif_parser.cpp
+++ b/src/add-ons/translators/jpeg/exif_parser.cpp
@@ -17,8 +17,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "exit_parser"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "exit_parser"
 
 
 using std::set;
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
index dcc885d87f..b2a8fe4e59 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
@@ -42,8 +42,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "JPEG2000Translator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "JPEG2000Translator"
 
 // Set these accordingly
 #define JP2_ACRONYM "JP2"
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
index e6679007a9..fc6be22086 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.h
@@ -53,8 +53,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "libjasper/jasper.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "JPEG2000Translator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "JPEG2000Translator"
 
 // Settings
 #define JP2_SETTINGS_FILE	"JPEG2000Translator"
diff --git a/src/add-ons/translators/pcx/ConfigView.cpp b/src/add-ons/translators/pcx/ConfigView.cpp
index 813b48dab2..d596d24f0f 100644
--- a/src/add-ons/translators/pcx/ConfigView.cpp
+++ b/src/add-ons/translators/pcx/ConfigView.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
diff --git a/src/add-ons/translators/pcx/PCXTranslator.cpp b/src/add-ons/translators/pcx/PCXTranslator.cpp
index de3b23c606..52b661f16f 100644
--- a/src/add-ons/translators/pcx/PCXTranslator.cpp
+++ b/src/add-ons/translators/pcx/PCXTranslator.cpp
@@ -14,8 +14,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PCXTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PCXTranslator"
 
 #define kPCXMimeType "image/x-pcx"
 
diff --git a/src/add-ons/translators/pcx/main.cpp b/src/add-ons/translators/pcx/main.cpp
index 76ac3440ba..ec8525d58f 100644
--- a/src/add-ons/translators/pcx/main.cpp
+++ b/src/add-ons/translators/pcx/main.cpp
@@ -13,8 +13,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 
 int
diff --git a/src/add-ons/translators/png/PNGMain.cpp b/src/add-ons/translators/png/PNGMain.cpp
index 6f5e675d0d..6707c9bdd3 100644
--- a/src/add-ons/translators/png/PNGMain.cpp
+++ b/src/add-ons/translators/png/PNGMain.cpp
@@ -38,8 +38,8 @@
 #include "PNGView.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PNGTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PNGTranslator"
 
 // ---------------------------------------------------------------
 // main
diff --git a/src/add-ons/translators/png/PNGTranslator.cpp b/src/add-ons/translators/png/PNGTranslator.cpp
index e83c658686..a982ad3e29 100644
--- a/src/add-ons/translators/png/PNGTranslator.cpp
+++ b/src/add-ons/translators/png/PNGTranslator.cpp
@@ -43,8 +43,8 @@
 
 #include "PNGView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PNGTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PNGTranslator"
 
 // The input formats that this translator supports.
 static const translation_format sInputFormats[] = {
diff --git a/src/add-ons/translators/png/PNGView.cpp b/src/add-ons/translators/png/PNGView.cpp
index 97315b970e..bde700b0c6 100644
--- a/src/add-ons/translators/png/PNGView.cpp
+++ b/src/add-ons/translators/png/PNGView.cpp
@@ -23,8 +23,8 @@
 #define PNG_NO_PEDANTIC_WARNINGS
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PNGTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PNGTranslator"
 
 PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
 		uint32 flags, TranslatorSettings *settings)
diff --git a/src/add-ons/translators/ppm/PPMMain.cpp b/src/add-ons/translators/ppm/PPMMain.cpp
index d0bc584b95..d89722b07b 100644
--- a/src/add-ons/translators/ppm/PPMMain.cpp
+++ b/src/add-ons/translators/ppm/PPMMain.cpp
@@ -15,8 +15,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PPMMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PPMMain"
 
 
 BPoint get_window_origin();
diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp b/src/add-ons/translators/ppm/PPMTranslator.cpp
index ce6c50355e..82d444f721 100644
--- a/src/add-ons/translators/ppm/PPMTranslator.cpp
+++ b/src/add-ons/translators/ppm/PPMTranslator.cpp
@@ -36,8 +36,8 @@
 
 #include "colorspace.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PPMTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PPMTranslator"
 
 #if DEBUG
  #define dprintf(x) printf x
diff --git a/src/add-ons/translators/raw/ConfigView.cpp b/src/add-ons/translators/raw/ConfigView.cpp
index 4044fa511d..c3d7bcb800 100644
--- a/src/add-ons/translators/raw/ConfigView.cpp
+++ b/src/add-ons/translators/raw/ConfigView.cpp
@@ -17,8 +17,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 const char* kShortName2 = B_TRANSLATE_MARK("RAWTranslator Settings");
 
diff --git a/src/add-ons/translators/raw/RAWTranslator.cpp b/src/add-ons/translators/raw/RAWTranslator.cpp
index 666eacb37c..031a0a6b2d 100644
--- a/src/add-ons/translators/raw/RAWTranslator.cpp
+++ b/src/add-ons/translators/raw/RAWTranslator.cpp
@@ -17,8 +17,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RAWTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RAWTranslator"
 
 
 class FreeAllocation {
diff --git a/src/add-ons/translators/raw/main.cpp b/src/add-ons/translators/raw/main.cpp
index e0b47704f2..ba033eabd4 100644
--- a/src/add-ons/translators/raw/main.cpp
+++ b/src/add-ons/translators/raw/main.cpp
@@ -25,8 +25,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RAWTranslator main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RAWTranslator main"
 
 int
 main(int argc, char **argv)
diff --git a/src/add-ons/translators/rtf/ConfigView.cpp b/src/add-ons/translators/rtf/ConfigView.cpp
index a2bd034fe3..300be8d6be 100644
--- a/src/add-ons/translators/rtf/ConfigView.cpp
+++ b/src/add-ons/translators/rtf/ConfigView.cpp
@@ -12,8 +12,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
diff --git a/src/add-ons/translators/rtf/RTFTranslator.cpp b/src/add-ons/translators/rtf/RTFTranslator.cpp
index 4c3646f68e..969b8710c2 100644
--- a/src/add-ons/translators/rtf/RTFTranslator.cpp
+++ b/src/add-ons/translators/rtf/RTFTranslator.cpp
@@ -14,8 +14,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RTFTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RTFTranslator"
 
 #define READ_BUFFER_SIZE 2048
 #define DATA_BUFFER_SIZE 64
diff --git a/src/add-ons/translators/rtf/main.cpp b/src/add-ons/translators/rtf/main.cpp
index 57e81681b0..e2357b1ead 100644
--- a/src/add-ons/translators/rtf/main.cpp
+++ b/src/add-ons/translators/rtf/main.cpp
@@ -19,8 +19,8 @@
 #include "RTF.h"
 #include "RTFTranslator.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 
 int
diff --git a/src/add-ons/translators/sgi/SGIMain.cpp b/src/add-ons/translators/sgi/SGIMain.cpp
index 4685d036b9..8ab4ed9970 100644
--- a/src/add-ons/translators/sgi/SGIMain.cpp
+++ b/src/add-ons/translators/sgi/SGIMain.cpp
@@ -39,8 +39,8 @@
 #include "SGITranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SGIMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SGIMain"
 
 // ---------------------------------------------------------------
 // main
diff --git a/src/add-ons/translators/sgi/SGITranslator.cpp b/src/add-ons/translators/sgi/SGITranslator.cpp
index 8753ce2157..066a9c6c70 100644
--- a/src/add-ons/translators/sgi/SGITranslator.cpp
+++ b/src/add-ons/translators/sgi/SGITranslator.cpp
@@ -54,8 +54,8 @@
 
 using std::nothrow;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SGITranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SGITranslator"
 
 
 // The input formats that this translator supports.
diff --git a/src/add-ons/translators/sgi/SGIView.cpp b/src/add-ons/translators/sgi/SGIView.cpp
index 61635dba52..0e87579171 100644
--- a/src/add-ons/translators/sgi/SGIView.cpp
+++ b/src/add-ons/translators/sgi/SGIView.cpp
@@ -50,8 +50,8 @@
 
 const char* author = "Stephan Aßmus, ";
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SGIView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SGIView"
 
 // add_menu_item
 void
diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp b/src/add-ons/translators/shared/BaseTranslator.cpp
index 569bb44e33..9dbbb6b5c3 100644
--- a/src/add-ons/translators/shared/BaseTranslator.cpp
+++ b/src/add-ons/translators/shared/BaseTranslator.cpp
@@ -38,8 +38,8 @@
 
 #include "BaseTranslator.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BaseTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BaseTranslator"
 
 
 // ---------------------------------------------------------------
diff --git a/src/add-ons/translators/shared/TranslatorWindow.cpp b/src/add-ons/translators/shared/TranslatorWindow.cpp
index 933cebf1d4..8e075d445a 100644
--- a/src/add-ons/translators/shared/TranslatorWindow.cpp
+++ b/src/add-ons/translators/shared/TranslatorWindow.cpp
@@ -35,8 +35,8 @@
 #include "TranslatorWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TranslatorWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TranslatorWindow"
 
 
 // ---------------------------------------------------------------
diff --git a/src/add-ons/translators/stxt/STXTMain.cpp b/src/add-ons/translators/stxt/STXTMain.cpp
index 34b54cab10..bd0b150a44 100644
--- a/src/add-ons/translators/stxt/STXTMain.cpp
+++ b/src/add-ons/translators/stxt/STXTMain.cpp
@@ -37,8 +37,8 @@
 #include "STXTTranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "STXTMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "STXTMain"
 
 // ---------------------------------------------------------------
 // main
diff --git a/src/add-ons/translators/stxt/STXTTranslator.cpp b/src/add-ons/translators/stxt/STXTTranslator.cpp
index 23d29c3e5e..b2b341a29f 100644
--- a/src/add-ons/translators/stxt/STXTTranslator.cpp
+++ b/src/add-ons/translators/stxt/STXTTranslator.cpp
@@ -28,8 +28,8 @@
 using namespace BPrivate;
 using namespace std;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "STXTTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "STXTTranslator"
 
 #define READ_BUFFER_SIZE 32768
 #define DATA_BUFFER_SIZE 256
diff --git a/src/add-ons/translators/stxt/STXTView.cpp b/src/add-ons/translators/stxt/STXTView.cpp
index edfb284744..9434d16807 100644
--- a/src/add-ons/translators/stxt/STXTView.cpp
+++ b/src/add-ons/translators/stxt/STXTView.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "STXTView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "STXTView"
 
 
 STXTView::STXTView(const BRect &frame, const char *name, uint32 resizeMode,
diff --git a/src/add-ons/translators/tga/TGAMain.cpp b/src/add-ons/translators/tga/TGAMain.cpp
index 48da8ba270..df8a3ee825 100644
--- a/src/add-ons/translators/tga/TGAMain.cpp
+++ b/src/add-ons/translators/tga/TGAMain.cpp
@@ -33,8 +33,8 @@
 #include "TGATranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TGAMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TGAMain"
 
 // ---------------------------------------------------------------
 // main
diff --git a/src/add-ons/translators/tga/TGATranslator.cpp b/src/add-ons/translators/tga/TGATranslator.cpp
index 96f90752bc..c3ba0b9dd5 100644
--- a/src/add-ons/translators/tga/TGATranslator.cpp
+++ b/src/add-ons/translators/tga/TGATranslator.cpp
@@ -37,8 +37,8 @@
 #include "TGAView.h"
 #include "StreamBuffer.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TGATranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TGATranslator"
 
 // The input formats that this translator supports.
 static const translation_format sInputFormats[] = {
diff --git a/src/add-ons/translators/tga/TGAView.cpp b/src/add-ons/translators/tga/TGAView.cpp
index f27e5e15ca..9a7c99f323 100644
--- a/src/add-ons/translators/tga/TGAView.cpp
+++ b/src/add-ons/translators/tga/TGAView.cpp
@@ -40,8 +40,8 @@
 #include "TGAView.h"
 #include "TGATranslator.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TGAView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TGAView"
 
 
 TGAView::TGAView(const char *name, uint32 flags, TranslatorSettings *settings)
diff --git a/src/add-ons/translators/tiff/TIFFMain.cpp b/src/add-ons/translators/tiff/TIFFMain.cpp
index 9e61799153..d274db4a1f 100644
--- a/src/add-ons/translators/tiff/TIFFMain.cpp
+++ b/src/add-ons/translators/tiff/TIFFMain.cpp
@@ -37,8 +37,8 @@
 #include "TIFFTranslator.h"
 #include "TranslatorWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TIFFMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TIFFMain"
 
 // ---------------------------------------------------------------
 // main
diff --git a/src/add-ons/translators/tiff/TIFFTranslator.cpp b/src/add-ons/translators/tiff/TIFFTranslator.cpp
index e7e07ff7bf..1b836f63d1 100644
--- a/src/add-ons/translators/tiff/TIFFTranslator.cpp
+++ b/src/add-ons/translators/tiff/TIFFTranslator.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TIFFTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TIFFTranslator"
 
 
 /*!
diff --git a/src/add-ons/translators/tiff/TIFFView.cpp b/src/add-ons/translators/tiff/TIFFView.cpp
index 784223ea29..6ec5e6247a 100644
--- a/src/add-ons/translators/tiff/TIFFView.cpp
+++ b/src/add-ons/translators/tiff/TIFFView.cpp
@@ -50,8 +50,8 @@
 
 #include "TIFFView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TIFFView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TIFFView"
 
 // add_menu_item
 void
diff --git a/src/add-ons/translators/webp/ConfigView.cpp b/src/add-ons/translators/webp/ConfigView.cpp
index 333a366f35..44719f38a1 100644
--- a/src/add-ons/translators/webp/ConfigView.cpp
+++ b/src/add-ons/translators/webp/ConfigView.cpp
@@ -31,8 +31,8 @@
 #include "WebPTranslator.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 static const uint32 kMsgQuality	= 'qlty';
diff --git a/src/add-ons/translators/webp/WebPTranslator.cpp b/src/add-ons/translators/webp/WebPTranslator.cpp
index 0a4baa8f23..d3592e87a8 100644
--- a/src/add-ons/translators/webp/WebPTranslator.cpp
+++ b/src/add-ons/translators/webp/WebPTranslator.cpp
@@ -25,8 +25,8 @@
 #include "TranslatorSettings.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WebPTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WebPTranslator"
 
 
 class FreeAllocation {
diff --git a/src/add-ons/translators/webp/main.cpp b/src/add-ons/translators/webp/main.cpp
index 5c42a0bee9..ab2087e8bf 100644
--- a/src/add-ons/translators/webp/main.cpp
+++ b/src/add-ons/translators/webp/main.cpp
@@ -14,8 +14,8 @@
 #include "WebPTranslator.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 
 int
diff --git a/src/add-ons/translators/wonderbrush/Layer.cpp b/src/add-ons/translators/wonderbrush/Layer.cpp
index 77b7b80726..68d9d4298f 100644
--- a/src/add-ons/translators/wonderbrush/Layer.cpp
+++ b/src/add-ons/translators/wonderbrush/Layer.cpp
@@ -21,8 +21,8 @@
 #include "support.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Layer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Layer"
 
 
 // constructor
diff --git a/src/add-ons/translators/wonderbrush/WonderBrushMain.cpp b/src/add-ons/translators/wonderbrush/WonderBrushMain.cpp
index e054f0aee4..3b39fc4778 100644
--- a/src/add-ons/translators/wonderbrush/WonderBrushMain.cpp
+++ b/src/add-ons/translators/wonderbrush/WonderBrushMain.cpp
@@ -13,8 +13,8 @@
 #include "TranslatorWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WonderBrushMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WonderBrushMain"
 
 
 int
diff --git a/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp b/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp
index 6895faa15d..1a1f43639a 100644
--- a/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp
+++ b/src/add-ons/translators/wonderbrush/WonderBrushTranslator.cpp
@@ -22,8 +22,8 @@
 #include "WonderBrushView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WonderBrushTranslator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WonderBrushTranslator"
 
 
 using std::nothrow;
diff --git a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp
index 975d38f649..ab3b25aebc 100644
--- a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp
+++ b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp
@@ -22,8 +22,8 @@
 #include "WonderBrushTranslator.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WonderBrushView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WonderBrushView"
 
 
 const char* kAuthor = "Stephan Aßmus, ";
diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp
index b43075b2c1..deba9af5e7 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -400,8 +400,8 @@ AboutApp::AboutApp()
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AboutWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AboutWindow"
 
 AboutWindow::AboutWindow()
 	: BWindow(BRect(0, 0, 500, 300), B_TRANSLATE("About this system"),
@@ -543,8 +543,8 @@ CropView::DoLayout()
 
 //	#pragma mark - AboutView
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AboutView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AboutView"
 
 AboutView::AboutView()
 	: BView("aboutview", B_WILL_DRAW | B_PULSE_NEEDED),
diff --git a/src/apps/aboutsystem/Utilities.cpp b/src/apps/aboutsystem/Utilities.cpp
index d8ef0b86a4..7dc052406d 100644
--- a/src/apps/aboutsystem/Utilities.cpp
+++ b/src/apps/aboutsystem/Utilities.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Utilities"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Utilities"
 
 
 BString
diff --git a/src/apps/activitymonitor/ActivityMonitor.h b/src/apps/activitymonitor/ActivityMonitor.h
index 808dca6082..7ac0fd3bb1 100644
--- a/src/apps/activitymonitor/ActivityMonitor.h
+++ b/src/apps/activitymonitor/ActivityMonitor.h
@@ -12,8 +12,8 @@
 class BMessage;
 class ActivityWindow;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ActivityWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ActivityWindow"
 
 
 class ActivityMonitor : public BApplication {
diff --git a/src/apps/activitymonitor/ActivityView.cpp b/src/apps/activitymonitor/ActivityView.cpp
index 88a5ae7b6e..e3db9f8845 100644
--- a/src/apps/activitymonitor/ActivityView.cpp
+++ b/src/apps/activitymonitor/ActivityView.cpp
@@ -32,8 +32,8 @@
 #include "SystemInfo.h"
 #include "SystemInfoHandler.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ActivityView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ActivityView"
 
 template
 class ListAddDeleter {
diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp
index 08b2b84e0c..188289163e 100644
--- a/src/apps/activitymonitor/ActivityWindow.cpp
+++ b/src/apps/activitymonitor/ActivityWindow.cpp
@@ -26,8 +26,8 @@
 #include "DataSource.h"
 #include "SettingsWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ActivityWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ActivityWindow"
 
 static const uint32 kMsgAddView = 'advw';
 static const uint32 kMsgShowSettings = 'shst';
diff --git a/src/apps/activitymonitor/DataSource.cpp b/src/apps/activitymonitor/DataSource.cpp
index 9fc9a5e2a6..644bf69988 100644
--- a/src/apps/activitymonitor/DataSource.cpp
+++ b/src/apps/activitymonitor/DataSource.cpp
@@ -15,8 +15,8 @@
 
 #include "SystemInfo.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DataSource"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DataSource"
 
 
 const DataSource* kSources[] = {
diff --git a/src/apps/activitymonitor/SettingsWindow.cpp b/src/apps/activitymonitor/SettingsWindow.cpp
index 9fe6690784..ad7ad43fae 100644
--- a/src/apps/activitymonitor/SettingsWindow.cpp
+++ b/src/apps/activitymonitor/SettingsWindow.cpp
@@ -15,8 +15,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SettingsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsWindow"
 
 
 static const uint32 kMsgUpdateTimeInterval = 'upti';
@@ -90,7 +90,7 @@ private:
 
 SettingsWindow::SettingsWindow(ActivityWindow* target)
 	: BWindow(_RelativeTo(target),
-		B_TRANSLATE_WITH_CONTEXT("Settings", "ActivityWindow"), B_FLOATING_WINDOW,
+		B_TRANSLATE_CONTEXT("Settings", "ActivityWindow"), B_FLOATING_WINDOW,
 	   	B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
 	fTarget(target)
 {
diff --git a/src/apps/bootmanager/BootManager.cpp b/src/apps/bootmanager/BootManager.cpp
index 4060d7cd93..4ea46380c4 100644
--- a/src/apps/bootmanager/BootManager.cpp
+++ b/src/apps/bootmanager/BootManager.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BootManager"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BootManager"
 
 
 static const char* kSignature = "application/x-vnd.Haiku-BootManager";
diff --git a/src/apps/bootmanager/BootManagerController.cpp b/src/apps/bootmanager/BootManagerController.cpp
index 92905f8cc8..f8b1bdbb9e 100644
--- a/src/apps/bootmanager/BootManagerController.cpp
+++ b/src/apps/bootmanager/BootManagerController.cpp
@@ -29,8 +29,8 @@
 #include "WizardView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BootManagerController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BootManagerController"
 
 
 BootManagerController::BootManagerController()
diff --git a/src/apps/bootmanager/BootManagerWindow.cpp b/src/apps/bootmanager/BootManagerWindow.cpp
index b0b4e39ef8..813f9856a4 100644
--- a/src/apps/bootmanager/BootManagerWindow.cpp
+++ b/src/apps/bootmanager/BootManagerWindow.cpp
@@ -22,8 +22,8 @@
 #include "WizardView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BootManagerWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BootManagerWindow"
 
 
 BootManagerWindow::BootManagerWindow()
diff --git a/src/apps/bootmanager/DefaultPartitionPage.cpp b/src/apps/bootmanager/DefaultPartitionPage.cpp
index 4cbb95f5b4..b211fd28e7 100644
--- a/src/apps/bootmanager/DefaultPartitionPage.cpp
+++ b/src/apps/bootmanager/DefaultPartitionPage.cpp
@@ -24,8 +24,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DefaultPartitionPage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DefaultPartitionPage"
 
 
 enum {
diff --git a/src/apps/bootmanager/DrivesPage.cpp b/src/apps/bootmanager/DrivesPage.cpp
index ee1a5fc57a..d96dc335e9 100644
--- a/src/apps/bootmanager/DrivesPage.cpp
+++ b/src/apps/bootmanager/DrivesPage.cpp
@@ -22,8 +22,8 @@
 #include "WizardView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DrivesPage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DrivesPage"
 
 
 const uint32 kMsgSelectionChanged = 'slch';
diff --git a/src/apps/bootmanager/FileSelectionPage.cpp b/src/apps/bootmanager/FileSelectionPage.cpp
index d480fb12f0..6901524cbe 100644
--- a/src/apps/bootmanager/FileSelectionPage.cpp
+++ b/src/apps/bootmanager/FileSelectionPage.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FileSelectionPage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FileSelectionPage"
 
 
 const uint32 kMsgOpenFilePanel = 'open';
diff --git a/src/apps/bootmanager/LegacyBootMenu.cpp b/src/apps/bootmanager/LegacyBootMenu.cpp
index 7ed04990e9..0e30e7c662 100644
--- a/src/apps/bootmanager/LegacyBootMenu.cpp
+++ b/src/apps/bootmanager/LegacyBootMenu.cpp
@@ -45,8 +45,8 @@
 */
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LegacyBootMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LegacyBootMenu"
 
 
 struct MasterBootRecord {
diff --git a/src/apps/bootmanager/PartitionsPage.cpp b/src/apps/bootmanager/PartitionsPage.cpp
index 9df64d7430..01c3c56cf8 100644
--- a/src/apps/bootmanager/PartitionsPage.cpp
+++ b/src/apps/bootmanager/PartitionsPage.cpp
@@ -28,8 +28,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PartitionsPage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PartitionsPage"
 
 
 const uint32 kMessageShow = 'show';
diff --git a/src/apps/bootmanager/UninstallPage.cpp b/src/apps/bootmanager/UninstallPage.cpp
index a95068a00a..b175a56e48 100644
--- a/src/apps/bootmanager/UninstallPage.cpp
+++ b/src/apps/bootmanager/UninstallPage.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "UninstallPage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "UninstallPage"
 
 
 static const float kTextDistance = 10;
diff --git a/src/apps/bootmanager/WizardView.cpp b/src/apps/bootmanager/WizardView.cpp
index 399a1c1498..bbaa92cb58 100644
--- a/src/apps/bootmanager/WizardView.cpp
+++ b/src/apps/bootmanager/WizardView.cpp
@@ -18,8 +18,8 @@
 #include "WizardPageView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WizardView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WizardView"
 
 
 WizardView::WizardView(const char* name)
diff --git a/src/apps/bsnow/SnowView.cpp b/src/apps/bsnow/SnowView.cpp
index 7363f24830..8625d1560d 100644
--- a/src/apps/bsnow/SnowView.cpp
+++ b/src/apps/bsnow/SnowView.cpp
@@ -19,8 +19,8 @@
 
 
 #define FORWARD_TO_PARENT
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BSnow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BSnow"
 
 
 SnowView::SnowView()
diff --git a/src/apps/cdplayer/CDPlayer.cpp b/src/apps/cdplayer/CDPlayer.cpp
index 9dea575459..5117b1f061 100644
--- a/src/apps/cdplayer/CDPlayer.cpp
+++ b/src/apps/cdplayer/CDPlayer.cpp
@@ -35,8 +35,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CDPlayer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CDPlayer"
 
 enum {
 	M_STOP = 'mstp',
diff --git a/src/apps/charactermap/CharacterMap.cpp b/src/apps/charactermap/CharacterMap.cpp
index 9afe5a3307..6d5d843712 100644
--- a/src/apps/charactermap/CharacterMap.cpp
+++ b/src/apps/charactermap/CharacterMap.cpp
@@ -13,8 +13,8 @@
 
 #include "CharacterWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CharacterMap"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CharacterMap"
 
 const char* kSignature = "application/x-vnd.Haiku-CharacterMap";
 
diff --git a/src/apps/charactermap/CharacterView.cpp b/src/apps/charactermap/CharacterView.cpp
index 0d12f13cd3..9a25108816 100644
--- a/src/apps/charactermap/CharacterView.cpp
+++ b/src/apps/charactermap/CharacterView.cpp
@@ -20,8 +20,8 @@
 
 #include "UnicodeBlocks.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CharacterView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CharacterView"
 
 static const uint32 kMsgCopyAsEscapedString = 'cesc';
 
diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp
index 7574103c2c..3f222884e8 100644
--- a/src/apps/charactermap/CharacterWindow.cpp
+++ b/src/apps/charactermap/CharacterWindow.cpp
@@ -32,8 +32,8 @@
 #include "CharacterView.h"
 #include "UnicodeBlockView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CharacterWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CharacterWindow"
 
 static const uint32 kMsgUnicodeBlockSelected = 'unbs';
 static const uint32 kMsgCharacterChanged = 'chch';
diff --git a/src/apps/charactermap/UnicodeBlocks.cpp b/src/apps/charactermap/UnicodeBlocks.cpp
index 79336bee94..a387949c71 100644
--- a/src/apps/charactermap/UnicodeBlocks.cpp
+++ b/src/apps/charactermap/UnicodeBlocks.cpp
@@ -8,8 +8,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "UnicodeBlocks"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "UnicodeBlocks"
 
 const unicode_block kNoBlock;
 
diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp
index 9c341e399d..2a68bce107 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CodyCam"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CodyCam"
 
 #define VIDEO_SIZE_X 320
 #define VIDEO_SIZE_Y 240
diff --git a/src/apps/codycam/FtpClient.cpp b/src/apps/codycam/FtpClient.cpp
index 431e6a9cae..3939ab046e 100644
--- a/src/apps/codycam/FtpClient.cpp
+++ b/src/apps/codycam/FtpClient.cpp
@@ -7,8 +7,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FtpClient"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FtpClient"
 
 
 FtpClient::FtpClient()
diff --git a/src/apps/codycam/Settings.cpp b/src/apps/codycam/Settings.cpp
index f34b377d41..af06871438 100644
--- a/src/apps/codycam/Settings.cpp
+++ b/src/apps/codycam/Settings.cpp
@@ -9,8 +9,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Settings"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Settings"
 
 
 Settings* settings = NULL;
diff --git a/src/apps/codycam/SettingsHandler.cpp b/src/apps/codycam/SettingsHandler.cpp
index 6ed6d9de19..c04c2566e4 100644
--- a/src/apps/codycam/SettingsHandler.cpp
+++ b/src/apps/codycam/SettingsHandler.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SettingsHandler"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsHandler"
 
 
 #if 0
diff --git a/src/apps/codycam/SftpClient.h b/src/apps/codycam/SftpClient.h
index 84892f5ceb..d9b17ead80 100644
--- a/src/apps/codycam/SftpClient.h
+++ b/src/apps/codycam/SftpClient.h
@@ -12,8 +12,8 @@
 #include "SpawningUploadClient.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SftpClient"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SftpClient"
 
 
 using std::string;
diff --git a/src/apps/codycam/VideoConsumer.cpp b/src/apps/codycam/VideoConsumer.cpp
index da92599ddc..c764d19c7c 100644
--- a/src/apps/codycam/VideoConsumer.cpp
+++ b/src/apps/codycam/VideoConsumer.cpp
@@ -26,8 +26,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "VideoConsumer.cpp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "VideoConsumer.cpp"
 
 #define M1 ((double)1000000.0)
 #define JITTER		20000
diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index 6a3f61192f..badd8ddef1 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -61,8 +61,8 @@ All rights reserved.
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MainWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainWindow"
 
 
 // This is a very ugly hack to be able to call the private
diff --git a/src/apps/deskbar/DeskbarMenu.cpp b/src/apps/deskbar/DeskbarMenu.cpp
index aebfcd138d..13a9cad413 100644
--- a/src/apps/deskbar/DeskbarMenu.cpp
+++ b/src/apps/deskbar/DeskbarMenu.cpp
@@ -57,8 +57,8 @@ All rights reserved.
 #include "StatusView.h"
 #include "tracker_private.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeskbarMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeskbarMenu"
 
 #define ROSTER_SIG "application/x-vnd.Be-ROST"
 
diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp
index d39c4e211e..c1eb196a80 100644
--- a/src/apps/deskbar/PreferencesWindow.cpp
+++ b/src/apps/deskbar/PreferencesWindow.cpp
@@ -33,8 +33,8 @@
 #include "StatusView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PreferencesWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PreferencesWindow"
 
 PreferencesWindow::PreferencesWindow(BRect frame)
 	:
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index bd42de82d4..b9aab75b59 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -119,8 +119,8 @@ DumpList(BList* itemlist)
 #endif	/* DB_ADDONS */
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Tray"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Tray"
 
 // don't change the name of this view to anything other than "Status"!
 
diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp
index 6417afc5aa..9aedbeecaf 100644
--- a/src/apps/deskbar/TimeView.cpp
+++ b/src/apps/deskbar/TimeView.cpp
@@ -63,8 +63,8 @@ enum {
 };
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TimeView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TimeView"
 
 TTimeView::TTimeView(float maxWidth, float height, bool use24HourClock,
 	bool showSeconds, bool showDayOfWeek, bool showTimeZone)
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index 7ce5c0247a..1342c93f86 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -61,8 +61,8 @@ const int32 kListFloater = 5;
 const int32 kSystemFloater = 6;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WindowMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WindowMenu"
 
 bool
 TWindowMenu::WindowShouldBeListed(uint32 behavior)
diff --git a/src/apps/deskcalc/CalcApplication.cpp b/src/apps/deskcalc/CalcApplication.cpp
index d9f49604df..3af4579f95 100644
--- a/src/apps/deskcalc/CalcApplication.cpp
+++ b/src/apps/deskcalc/CalcApplication.cpp
@@ -22,8 +22,8 @@
 
 #include "CalcWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CalcApplication"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CalcApplication"
 
 static const char* kSettingsFileName	= "DeskCalc_settings";
 const char* kAppSig				= "application/x-vnd.Haiku-DeskCalc";
diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp
index bf36d2e764..80151d23f2 100644
--- a/src/apps/deskcalc/CalcView.cpp
+++ b/src/apps/deskcalc/CalcView.cpp
@@ -43,8 +43,8 @@
 #include "CalcOptions.h"
 #include "ExpressionTextView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CalcView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CalcView"
 
 //const uint8 K_COLOR_OFFSET				= 32;
 const float kFontScaleY						= 0.4f;
diff --git a/src/apps/deskcalc/CalcWindow.cpp b/src/apps/deskcalc/CalcWindow.cpp
index 49ce98d5a6..823a767350 100644
--- a/src/apps/deskcalc/CalcWindow.cpp
+++ b/src/apps/deskcalc/CalcWindow.cpp
@@ -23,8 +23,8 @@
 #include "CalcView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Window"
 
 
 CalcWindow::CalcWindow(BRect frame, BMessage* settings)
diff --git a/src/apps/devices/Device.cpp b/src/apps/devices/Device.cpp
index 92fd3852d9..d306bc850d 100644
--- a/src/apps/devices/Device.cpp
+++ b/src/apps/devices/Device.cpp
@@ -13,8 +13,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Device"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Device"
 
 // This list comes from the pciid list, except for the last one
 const char* kCategoryString[] = {
diff --git a/src/apps/devices/DeviceACPI.cpp b/src/apps/devices/DeviceACPI.cpp
index 9bb8e71a75..291d341877 100644
--- a/src/apps/devices/DeviceACPI.cpp
+++ b/src/apps/devices/DeviceACPI.cpp
@@ -14,8 +14,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeviceACPI"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeviceACPI"
 
 
 DeviceACPI::DeviceACPI(Device* parent)
diff --git a/src/apps/devices/DevicePCI.cpp b/src/apps/devices/DevicePCI.cpp
index 63ce19553b..0913373dcb 100644
--- a/src/apps/devices/DevicePCI.cpp
+++ b/src/apps/devices/DevicePCI.cpp
@@ -14,8 +14,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DevicePCI"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DevicePCI"
 
 extern "C" {
 #include "dm_wrapper.h"
diff --git a/src/apps/devices/DeviceSCSI.cpp b/src/apps/devices/DeviceSCSI.cpp
index fd38d97ad8..84145f4cce 100644
--- a/src/apps/devices/DeviceSCSI.cpp
+++ b/src/apps/devices/DeviceSCSI.cpp
@@ -15,8 +15,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeviceSCSI"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeviceSCSI"
 
 
 // standard SCSI device types
diff --git a/src/apps/devices/DevicesApplication.cpp b/src/apps/devices/DevicesApplication.cpp
index 3849026422..67466e3936 100644
--- a/src/apps/devices/DevicesApplication.cpp
+++ b/src/apps/devices/DevicesApplication.cpp
@@ -14,8 +14,8 @@
 
 #include "DevicesView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DevicesApplication"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DevicesApplication"
 
 class DevicesApplication : public BApplication {
 public:
diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp
index 86e16efa00..c14111bcc7 100644
--- a/src/apps/devices/DevicesView.cpp
+++ b/src/apps/devices/DevicesView.cpp
@@ -18,8 +18,8 @@
 
 #include "DevicesView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DevicesView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DevicesView"
 
 DevicesView::DevicesView()
 	:
diff --git a/src/apps/devices/PropertyList.cpp b/src/apps/devices/PropertyList.cpp
index df31e7f917..28b187dfee 100644
--- a/src/apps/devices/PropertyList.cpp
+++ b/src/apps/devices/PropertyList.cpp
@@ -12,8 +12,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PropertyList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PropertyList"
 
 
 PropertyRow::PropertyRow(const char* name, const char* value)
diff --git a/src/apps/devices/ResourceUsageWindow.cpp b/src/apps/devices/ResourceUsageWindow.cpp
index cb5548e543..0cc13fa6ce 100644
--- a/src/apps/devices/ResourceUsageWindow.cpp
+++ b/src/apps/devices/ResourceUsageWindow.cpp
@@ -26,8 +26,8 @@
 #include "DevicesInfo.h"
 #include "DevicesWindows.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ResourceUsageWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ResourceUsageWindow"
 
 class IRQDMAItem : public BListItem
 {
diff --git a/src/apps/diskprobe/AttributeWindow.cpp b/src/apps/diskprobe/AttributeWindow.cpp
index b9d70a7239..595d6ca399 100644
--- a/src/apps/diskprobe/AttributeWindow.cpp
+++ b/src/apps/diskprobe/AttributeWindow.cpp
@@ -22,8 +22,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AttributeWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AttributeWindow"
 
 
 static const uint32 kMsgRemoveAttribute = 'rmat';
diff --git a/src/apps/diskprobe/DiskProbe.cpp b/src/apps/diskprobe/DiskProbe.cpp
index df351aff78..600a8b90eb 100644
--- a/src/apps/diskprobe/DiskProbe.cpp
+++ b/src/apps/diskprobe/DiskProbe.cpp
@@ -29,8 +29,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DiskProbe"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DiskProbe"
 
 const char *kSignature = "application/x-vnd.Haiku-DiskProbe";
 
diff --git a/src/apps/diskprobe/FileWindow.cpp b/src/apps/diskprobe/FileWindow.cpp
index 60b216b514..d18f21fe0b 100644
--- a/src/apps/diskprobe/FileWindow.cpp
+++ b/src/apps/diskprobe/FileWindow.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FileWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FileWindow"
 
 
 FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings)
diff --git a/src/apps/diskprobe/FindWindow.cpp b/src/apps/diskprobe/FindWindow.cpp
index 0fbb6d87f6..0ed756f9d0 100644
--- a/src/apps/diskprobe/FindWindow.cpp
+++ b/src/apps/diskprobe/FindWindow.cpp
@@ -31,8 +31,8 @@
 #include "DiskProbe.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FindWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FindWindow"
 
 static const uint32 kMsgFindMode = 'FMde';
 static const uint32 kMsgStartFind = 'SFnd';
diff --git a/src/apps/diskprobe/OpenWindow.cpp b/src/apps/diskprobe/OpenWindow.cpp
index 3a35eccfd0..108780628e 100644
--- a/src/apps/diskprobe/OpenWindow.cpp
+++ b/src/apps/diskprobe/OpenWindow.cpp
@@ -24,8 +24,8 @@
 #include "DiskProbe.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "OpenWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "OpenWindow"
 
 static const uint32 kMsgProbeFile = 'prDv';
 static const uint32 kMsgProbeDevice = 'prFl';
diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp
index 3f26c83219..2fcaea48d7 100644
--- a/src/apps/diskprobe/ProbeView.cpp
+++ b/src/apps/diskprobe/ProbeView.cpp
@@ -52,8 +52,8 @@
 	// (even in Dano/Zeta)
 #endif
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProbeView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProbeView"
 
 static const uint32 kMsgSliderUpdate = 'slup';
 static const uint32 kMsgPositionUpdate = 'poup';
diff --git a/src/apps/diskprobe/TypeEditors.cpp b/src/apps/diskprobe/TypeEditors.cpp
index 4c33476da1..2183ff81c2 100644
--- a/src/apps/diskprobe/TypeEditors.cpp
+++ b/src/apps/diskprobe/TypeEditors.cpp
@@ -32,8 +32,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TypeEditors"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TypeEditors"
 
 static const uint32 kMsgValueChanged = 'vlch';
 static const uint32 kMsgScaleChanged = 'scch';
diff --git a/src/apps/diskusage/DiskUsage.cpp b/src/apps/diskusage/DiskUsage.cpp
index 2cdf4254b2..c363d93d79 100644
--- a/src/apps/diskusage/DiskUsage.cpp
+++ b/src/apps/diskusage/DiskUsage.cpp
@@ -14,8 +14,8 @@
 
 #include "DiskUsage.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DiskUsage"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DiskUsage"
 
 entry_ref helpFileRef;
 bool helpFileWasFound = false;
diff --git a/src/apps/diskusage/InfoWindow.cpp b/src/apps/diskusage/InfoWindow.cpp
index 9c46410a8a..5ab26d73f6 100644
--- a/src/apps/diskusage/InfoWindow.cpp
+++ b/src/apps/diskusage/InfoWindow.cpp
@@ -28,8 +28,8 @@ using std::string;
 using std::vector;
 using std::pair;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Info Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Info Window"
 
 LeftView::LeftView(BRect frame, BBitmap* icon)
 	:
diff --git a/src/apps/diskusage/MainWindow.cpp b/src/apps/diskusage/MainWindow.cpp
index 5f378c8f5c..c540ca56ff 100644
--- a/src/apps/diskusage/MainWindow.cpp
+++ b/src/apps/diskusage/MainWindow.cpp
@@ -20,8 +20,8 @@
 #include "DiskUsage.h"
 #include "ControlsView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MainWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainWindow"
 
 MainWindow::MainWindow(BRect pieRect)
 	:
diff --git a/src/apps/diskusage/PieView.cpp b/src/apps/diskusage/PieView.cpp
index e3ec4e637e..1be66aa263 100644
--- a/src/apps/diskusage/PieView.cpp
+++ b/src/apps/diskusage/PieView.cpp
@@ -36,8 +36,8 @@
 #include "MainWindow.h"
 #include "Scanner.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Pie View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Pie View"
 
 static const int32 kIdxGetInfo = 0;
 static const int32 kIdxOpen = 1;
diff --git a/src/apps/diskusage/Scanner.cpp b/src/apps/diskusage/Scanner.cpp
index b2e6e1b3ca..9ed5078083 100644
--- a/src/apps/diskusage/Scanner.cpp
+++ b/src/apps/diskusage/Scanner.cpp
@@ -19,8 +19,8 @@
 
 #include "DiskUsage.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Scanner"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Scanner"
 
 using std::vector;
 
diff --git a/src/apps/diskusage/StatusView.cpp b/src/apps/diskusage/StatusView.cpp
index 9bc932a53e..7584c310cd 100644
--- a/src/apps/diskusage/StatusView.cpp
+++ b/src/apps/diskusage/StatusView.cpp
@@ -26,8 +26,8 @@
 #include "DiskUsage.h"
 #include "Scanner.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Status View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Status View"
 
 StatusView::StatusView()
 	:
diff --git a/src/apps/diskusage/VolumeView.cpp b/src/apps/diskusage/VolumeView.cpp
index 2b0f80a3f7..ead2c074fd 100644
--- a/src/apps/diskusage/VolumeView.cpp
+++ b/src/apps/diskusage/VolumeView.cpp
@@ -24,8 +24,8 @@
 
 #include "VolumeView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Volume View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Volume View"
 
 const float kMinWinSize = 275.0;
 
diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParamsPanel.cpp
index 771cd5231a..337b0b5966 100644
--- a/src/apps/drivesetup/CreateParamsPanel.cpp
+++ b/src/apps/drivesetup/CreateParamsPanel.cpp
@@ -29,8 +29,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CreateParamsPanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CreateParamsPanel"
 
 
 class CreateParamsPanel::EscapeFilter : public BMessageFilter {
diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
index 2ce23a76d2..7dd0df5657 100644
--- a/src/apps/drivesetup/DiskView.cpp
+++ b/src/apps/drivesetup/DiskView.cpp
@@ -19,8 +19,8 @@
 #include "MainWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DiskView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DiskView"
 
 using BPrivate::HashMap;
 using BPrivate::HashKey32;
diff --git a/src/apps/drivesetup/InitParamsPanel.cpp b/src/apps/drivesetup/InitParamsPanel.cpp
index 0a5dddbf63..6c2f9de90a 100644
--- a/src/apps/drivesetup/InitParamsPanel.cpp
+++ b/src/apps/drivesetup/InitParamsPanel.cpp
@@ -27,8 +27,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InitParamsPanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InitParamsPanel"
 
 
 class InitParamsPanel::EscapeFilter : public BMessageFilter {
diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index e9694d3d52..1341f1b8f8 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -44,8 +44,8 @@
 #include "tracker_private.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MainWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainWindow"
 
 
 class ListPopulatorVisitor : public BDiskDeviceVisitor {
diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp
index 3610a5ec41..49b9b84673 100644
--- a/src/apps/drivesetup/PartitionList.cpp
+++ b/src/apps/drivesetup/PartitionList.cpp
@@ -20,8 +20,8 @@
 #include "Support.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PartitionList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PartitionList"
 
 
 // #pragma mark - BBitmapStringField
diff --git a/src/apps/drivesetup/Support.cpp b/src/apps/drivesetup/Support.cpp
index 0f2956166d..23e19ac730 100644
--- a/src/apps/drivesetup/Support.cpp
+++ b/src/apps/drivesetup/Support.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Support"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Support"
 
 
 void
diff --git a/src/apps/expander/DirectoryFilePanel.cpp b/src/apps/expander/DirectoryFilePanel.cpp
index df25f183f5..5671dc0aa6 100644
--- a/src/apps/expander/DirectoryFilePanel.cpp
+++ b/src/apps/expander/DirectoryFilePanel.cpp
@@ -43,8 +43,8 @@ DirectoryRefFilter::Filter(const entry_ref *ref, BNode* node,
 
 //	#pragma mark -
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DirectoryFilePanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DirectoryFilePanel"
 
 
 DirectoryFilePanel::DirectoryFilePanel(file_panel_mode mode, BMessenger* target,
diff --git a/src/apps/expander/ExpanderPreferences.cpp b/src/apps/expander/ExpanderPreferences.cpp
index cefe568898..e7fc7490db 100644
--- a/src/apps/expander/ExpanderPreferences.cpp
+++ b/src/apps/expander/ExpanderPreferences.cpp
@@ -26,8 +26,8 @@ const uint32 MSG_DESTUSE	= 'mDeu';
 const uint32 MSG_DESTTEXT	= 'mDet';
 const uint32 MSG_DESTSELECT = 'mDes';
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ExpanderPreferences"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ExpanderPreferences"
 
 
 ExpanderPreferences::ExpanderPreferences(BMessage* settings)
diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp
index c2c0701db0..7355ce5e51 100644
--- a/src/apps/expander/ExpanderWindow.cpp
+++ b/src/apps/expander/ExpanderWindow.cpp
@@ -44,8 +44,8 @@ const uint32 MSG_DESTTEXT		= 'mDTX';
 const uint32 MSG_SHOWCONTENTS	= 'mSCT';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ExpanderWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ExpanderWindow"
 
 ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref,
 		BMessage* settings)
@@ -506,8 +506,8 @@ ExpanderWindow::RefsReceived(BMessage* msg)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ExpanderMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ExpanderMenu"
 
 void
 ExpanderWindow::_AddMenuBar(BLayout* layout)
@@ -542,8 +542,8 @@ ExpanderWindow::_AddMenuBar(BLayout* layout)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ExpanderWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ExpanderWindow"
 
 void
 ExpanderWindow::StartExpanding()
diff --git a/src/apps/fontdemo/ControlView.cpp b/src/apps/fontdemo/ControlView.cpp
index 9d85aa0a13..771e8400b2 100644
--- a/src/apps/fontdemo/ControlView.cpp
+++ b/src/apps/fontdemo/ControlView.cpp
@@ -25,8 +25,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ControlView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ControlView"
 
 ControlView::ControlView(BRect rect)
 	: BView(rect, "ControlView", B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE_JUMP),
diff --git a/src/apps/fontdemo/FontDemo.cpp b/src/apps/fontdemo/FontDemo.cpp
index b46d69c29a..a23cf6b3e8 100644
--- a/src/apps/fontdemo/FontDemo.cpp
+++ b/src/apps/fontdemo/FontDemo.cpp
@@ -14,8 +14,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FontDemo"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FontDemo"
 
 const BString APP_NAME = B_TRANSLATE_MARK("FontDemo");
 
diff --git a/src/apps/fontdemo/FontDemoView.cpp b/src/apps/fontdemo/FontDemoView.cpp
index b62ec3f9a7..1dae1a56ed 100644
--- a/src/apps/fontdemo/FontDemoView.cpp
+++ b/src/apps/fontdemo/FontDemoView.cpp
@@ -22,8 +22,8 @@
 
 #include "messages.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FontDemoView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FontDemoView"
 
 FontDemoView::FontDemoView(BRect rect)
 	: BView(rect, "FontDemoView", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS),
diff --git a/src/apps/glteapot/ObjectView.cpp b/src/apps/glteapot/ObjectView.cpp
index 0999ed724d..bf14e13d76 100644
--- a/src/apps/glteapot/ObjectView.cpp
+++ b/src/apps/glteapot/ObjectView.cpp
@@ -28,8 +28,8 @@
 #include "GLObject.h"
 #include "ResScroll.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ObjectView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ObjectView"
 
 float displayScale = 1.0;
 float depthOfView = 30.0;
diff --git a/src/apps/glteapot/TeapotWindow.cpp b/src/apps/glteapot/TeapotWindow.cpp
index 659c805612..443cbd4e4c 100644
--- a/src/apps/glteapot/TeapotWindow.cpp
+++ b/src/apps/glteapot/TeapotWindow.cpp
@@ -13,8 +13,8 @@
 
 #include "TeapotWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TeapotWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TeapotWindow"
 
 TeapotWindow::TeapotWindow(BRect rect, const char* name, window_type wt,
 	ulong something)
diff --git a/src/apps/icon-o-matic/IconEditorApp.cpp b/src/apps/icon-o-matic/IconEditorApp.cpp
index 931975605b..65c48b8610 100644
--- a/src/apps/icon-o-matic/IconEditorApp.cpp
+++ b/src/apps/icon-o-matic/IconEditorApp.cpp
@@ -26,8 +26,8 @@
 #include "SavePanel.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Main"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp
index 85190453ec..f7a0b07e1c 100644
--- a/src/apps/icon-o-matic/MainWindow.cpp
+++ b/src/apps/icon-o-matic/MainWindow.cpp
@@ -82,8 +82,8 @@
 #include "StyledTextImporter.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Main"
 
 
 using std::nothrow;
@@ -184,7 +184,7 @@ MainWindow::MessageReceived(BMessage* message)
 				continue;
 			char name[30];
 			sprintf(name, 
-				B_TRANSLATE_WITH_CONTEXT("Color (#%02x%02x%02x)", 
+				B_TRANSLATE_CONTEXT("Color (#%02x%02x%02x)", 
 					"Style name after dropping a color"), 
 				color->red, color->green, color->blue);
 			Style* style = new (nothrow) Style(*color);
@@ -359,7 +359,7 @@ MainWindow::MessageReceived(BMessage* message)
 			if (fUndoMI->IsEnabled())
 				fUndoMI->SetLabel(label.String());
 			else {
-				fUndoMI->SetLabel(B_TRANSLATE_WITH_CONTEXT("",
+				fUndoMI->SetLabel(B_TRANSLATE_CONTEXT("",
 					"Icon-O-Matic-Menu-Edit"));
 			}
 	
@@ -369,7 +369,7 @@ MainWindow::MessageReceived(BMessage* message)
 			if (fRedoMI->IsEnabled())
 				fRedoMI->SetLabel(label.String());
 			else {
-				fRedoMI->SetLabel(B_TRANSLATE_WITH_CONTEXT("",
+				fRedoMI->SetLabel(B_TRANSLATE_CONTEXT("",
 					"Icon-O-Matic-Menu-Edit"));
 			}
 			break;
@@ -424,7 +424,7 @@ MainWindow::MessageReceived(BMessage* message)
 					commands[1] = pathCommand;
 					commands[2] = shapeCommand;
 					command = new CompoundCommand(commands, 3,
-						B_TRANSLATE_WITH_CONTEXT("Add shape with path & style",
+						B_TRANSLATE_CONTEXT("Add shape with path & style",
 							"Icon-O-Matic-Menu-Shape"),
 						0);
 				} else if (styleCommand) {
@@ -432,7 +432,7 @@ MainWindow::MessageReceived(BMessage* message)
 					commands[0] = styleCommand;
 					commands[1] = shapeCommand;
 					command = new CompoundCommand(commands, 2,
-						B_TRANSLATE_WITH_CONTEXT("Add shape with style",
+						B_TRANSLATE_CONTEXT("Add shape with style",
 							"Icon-O-Matic-Menu-Shape"), 
 						0);
 				} else {
@@ -440,7 +440,7 @@ MainWindow::MessageReceived(BMessage* message)
 					commands[0] = pathCommand;
 					commands[1] = shapeCommand;
 					command = new CompoundCommand(commands, 2,
-						B_TRANSLATE_WITH_CONTEXT("Add shape with path",
+						B_TRANSLATE_CONTEXT("Add shape with path",
 							"Icon-O-Matic-Menu-Shape"), 
 						0);
 				}
@@ -712,9 +712,9 @@ MainWindow::Open(const entry_ref& ref, bool append)
 		BString helper(B_TRANSLATE("Opening the document failed!"));
 		helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
 		BAlert* alert = new BAlert(
-			B_TRANSLATE_WITH_CONTEXT("bad news", "Title of error alert"),
+			B_TRANSLATE_CONTEXT("bad news", "Title of error alert"),
 			helper.String(), 
-			B_TRANSLATE_WITH_CONTEXT("Bummer", 
+			B_TRANSLATE_CONTEXT("Bummer", 
 				"Cancel button - error alert"),	
 			NULL, NULL);
 		// launch alert asynchronously
@@ -790,9 +790,9 @@ MainWindow::Open(const BMessenger& externalObserver, const uint8* data,
 			BString helper(B_TRANSLATE("Opening the icon failed!"));
 			helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
 			BAlert* alert = new BAlert(
-				B_TRANSLATE_WITH_CONTEXT("bad news", "Title of error alert"),
+				B_TRANSLATE_CONTEXT("bad news", "Title of error alert"),
 				helper.String(), 
-				B_TRANSLATE_WITH_CONTEXT("Bummer", 
+				B_TRANSLATE_CONTEXT("Bummer", 
 					"Cancel button - error alert"),	
 				NULL, NULL);
 			// launch alert asynchronously
@@ -1134,8 +1134,8 @@ MainWindow::_CreateMenuBar()
 	BMenuBar* menuBar = new BMenuBar("main menu");
 
 
-	#undef B_TRANSLATE_CONTEXT
-	#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Menus"
+	#undef B_TRANSLATION_CONTEXT
+	#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Menus"
 	
 	
 	BMenu* fileMenu = new BMenu(B_TRANSLATE("File"));
@@ -1154,8 +1154,8 @@ MainWindow::_CreateMenuBar()
 
 
 	// File
-	#undef B_TRANSLATE_CONTEXT
-	#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Menu-File"
+	#undef B_TRANSLATION_CONTEXT
+	#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Menu-File"
 	
 
 	BMenuItem* item = new BMenuItem(B_TRANSLATE("New"),
@@ -1190,8 +1190,8 @@ MainWindow::_CreateMenuBar()
 	item->SetTarget(be_app);
 
 	// Edit
-	#undef B_TRANSLATE_CONTEXT
-	#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Menu-Edit"
+	#undef B_TRANSLATION_CONTEXT
+	#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Menu-Edit"
 	
 	
 	fUndoMI = new BMenuItem(B_TRANSLATE(""),
@@ -1207,8 +1207,8 @@ MainWindow::_CreateMenuBar()
 
 
 	// Settings
-	#undef B_TRANSLATE_CONTEXT
-	#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Menu-Settings"
+	#undef B_TRANSLATION_CONTEXT
+	#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Menu-Settings"
 	
 	
 	BMenu* filterModeMenu = new BMenu(B_TRANSLATE("Snap to grid"));
diff --git a/src/apps/icon-o-matic/document/SetPropertiesCommand.cpp b/src/apps/icon-o-matic/document/SetPropertiesCommand.cpp
index 40a21474b8..8ad8ba7294 100644
--- a/src/apps/icon-o-matic/document/SetPropertiesCommand.cpp
+++ b/src/apps/icon-o-matic/document/SetPropertiesCommand.cpp
@@ -19,8 +19,8 @@
 #include "PropertyObject.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Properties"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Properties"
 
 
 // constructor
@@ -90,10 +90,10 @@ SetPropertiesCommand::GetName(BString& name)
 		BString property = name_for_id(
 			fOldProperties->PropertyAt(0)->Identifier());
 		if (fObjectCount > 1)
-			name << B_TRANSLATE_WITH_CONTEXT("Multi Set ",
+			name << B_TRANSLATE_CONTEXT("Multi Set ",
 				"Multi Set (property name)") << property;
 		else
-			name << B_TRANSLATE_WITH_CONTEXT("Set ", "Set (property name)")
+			name << B_TRANSLATE_CONTEXT("Set ", "Set (property name)")
 				 << property;
 	}
 }
diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp
index ef2870b0da..330e5ae4a0 100644
--- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp
+++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp
@@ -28,8 +28,8 @@
 #include "ColorPickerView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-ColorPicker"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-ColorPicker"
 
 
 enum {
diff --git a/src/apps/icon-o-matic/generic/property/CommonPropertyIDs.cpp b/src/apps/icon-o-matic/generic/property/CommonPropertyIDs.cpp
index 67ae798470..82b8541538 100644
--- a/src/apps/icon-o-matic/generic/property/CommonPropertyIDs.cpp
+++ b/src/apps/icon-o-matic/generic/property/CommonPropertyIDs.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-PropertyNames"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-PropertyNames"
 
 
 // name_for_id
diff --git a/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp b/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
index e9dffce431..dfb220df21 100644
--- a/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
+++ b/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
@@ -32,8 +32,8 @@
 #include "ScrollView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Properties"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Properties"
 
 
 enum {
diff --git a/src/apps/icon-o-matic/gui/IconObjectListView.cpp b/src/apps/icon-o-matic/gui/IconObjectListView.cpp
index 92dc31b0ac..d017d548b3 100644
--- a/src/apps/icon-o-matic/gui/IconObjectListView.cpp
+++ b/src/apps/icon-o-matic/gui/IconObjectListView.cpp
@@ -25,8 +25,8 @@
 #include "SetPropertiesCommand.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-PropertiesList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-PropertiesList"
 
 
 using std::nothrow;
@@ -59,11 +59,11 @@ IconObjectListView::Draw(BRect updateRect)
 		return;
 
 	// display helpful messages
-	const char* message1 = B_TRANSLATE_WITH_CONTEXT(
+	const char* message1 = B_TRANSLATE_CONTEXT(
 		"Click on an object in", "Empty property list - 1st line");
-	const char* message2 = B_TRANSLATE_WITH_CONTEXT(
+	const char* message2 = B_TRANSLATE_CONTEXT(
 		"any of the other lists to", "Empty property list - 2nd line");
-	const char* message3 = B_TRANSLATE_WITH_CONTEXT(
+	const char* message3 = B_TRANSLATE_CONTEXT(
 		"edit it's properties here.", "Empty property list - 3rd line");
 
 	SetHighColor(tint_color(LowColor(), B_DARKEN_2_TINT));
diff --git a/src/apps/icon-o-matic/gui/PathListView.cpp b/src/apps/icon-o-matic/gui/PathListView.cpp
index 60ed29105a..59e8059eeb 100644
--- a/src/apps/icon-o-matic/gui/PathListView.cpp
+++ b/src/apps/icon-o-matic/gui/PathListView.cpp
@@ -37,8 +37,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-PathsList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-PathsList"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/gui/SavePanel.cpp b/src/apps/icon-o-matic/gui/SavePanel.cpp
index ee853c0d4c..a131378cdc 100644
--- a/src/apps/icon-o-matic/gui/SavePanel.cpp
+++ b/src/apps/icon-o-matic/gui/SavePanel.cpp
@@ -29,8 +29,8 @@
 #include "Panel.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SavePanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SavePanel"
 
 
 enum {
@@ -206,7 +206,7 @@ SavePanel::SetExportMode(bool exportMode)
 		fFormatMF->SetEnabled(true);
 		SetExportMode(fExportMode);
 		_EnableSettings();
-		helper << B_TRANSLATE_WITH_CONTEXT("Export Icon", "Dialog title");
+		helper << B_TRANSLATE_CONTEXT("Export Icon", "Dialog title");
 	} else {
 		fExportMode = ExportMode();
 			// does not overwrite fExportMode in case we already were
@@ -215,7 +215,7 @@ SavePanel::SetExportMode(bool exportMode)
 
 		fFormatMF->SetEnabled(false);
 		fSettingsB->SetEnabled(false);
-		helper << B_TRANSLATE_WITH_CONTEXT("Save Icon", "Dialog title");
+		helper << B_TRANSLATE_CONTEXT("Save Icon", "Dialog title");
 	}
 
 	window->Unlock();
diff --git a/src/apps/icon-o-matic/gui/ShapeListView.cpp b/src/apps/icon-o-matic/gui/ShapeListView.cpp
index e4d81d5e76..6dd90cc0d5 100644
--- a/src/apps/icon-o-matic/gui/ShapeListView.cpp
+++ b/src/apps/icon-o-matic/gui/ShapeListView.cpp
@@ -35,8 +35,8 @@
 #include "Util.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-ShapesList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-ShapesList"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/gui/StyleListView.cpp b/src/apps/icon-o-matic/gui/StyleListView.cpp
index 03132f7910..72842233e3 100644
--- a/src/apps/icon-o-matic/gui/StyleListView.cpp
+++ b/src/apps/icon-o-matic/gui/StyleListView.cpp
@@ -35,8 +35,8 @@
 #include "Util.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-StylesList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-StylesList"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/gui/StyleView.cpp b/src/apps/icon-o-matic/gui/StyleView.cpp
index 79c58444c0..80f79443aa 100644
--- a/src/apps/icon-o-matic/gui/StyleView.cpp
+++ b/src/apps/icon-o-matic/gui/StyleView.cpp
@@ -33,8 +33,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-StyleTypes"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-StyleTypes"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/gui/TransformerListView.cpp b/src/apps/icon-o-matic/gui/TransformerListView.cpp
index e74e891b83..b485713e18 100644
--- a/src/apps/icon-o-matic/gui/TransformerListView.cpp
+++ b/src/apps/icon-o-matic/gui/TransformerListView.cpp
@@ -31,8 +31,8 @@
 #include "Selection.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-TransformersList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-TransformersList"
 
 
 using std::nothrow;
@@ -135,9 +135,9 @@ TransformerListView::Draw(BRect updateRect)
 		return;
 
 	// display helpful messages
-	const char* message1 = B_TRANSLATE_WITH_CONTEXT("Click on a shape above", 
+	const char* message1 = B_TRANSLATE_CONTEXT("Click on a shape above", 
 		"Empty transformers list - 1st line");
-	const char* message2 = B_TRANSLATE_WITH_CONTEXT("to attach transformers.",
+	const char* message2 = B_TRANSLATE_CONTEXT("to attach transformers.",
 		"Empty transformers list - 2nd line");
 
 	SetHighColor(tint_color(LowColor(), B_DARKEN_2_TINT));
diff --git a/src/apps/icon-o-matic/import_export/Exporter.cpp b/src/apps/icon-o-matic/import_export/Exporter.cpp
index 8ce088e9c8..725148b94f 100644
--- a/src/apps/icon-o-matic/import_export/Exporter.cpp
+++ b/src/apps/icon-o-matic/import_export/Exporter.cpp
@@ -25,8 +25,8 @@
 #include "Icon.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-Exporter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-Exporter"
 
 
 using std::nothrow;
@@ -112,7 +112,7 @@ Exporter::_ExportThread()
 		BString helper(B_TRANSLATE("Saving your document failed!"));
 		helper << "\n\n" << B_TRANSLATE("Error: ") << strerror(ret);
 		BAlert* alert = new BAlert(B_TRANSLATE("bad news"), helper.String(),
-			B_TRANSLATE_WITH_CONTEXT("Bleep!", 
+			B_TRANSLATE_CONTEXT("Bleep!", 
 				"Exporter - Continue in error dialog"), 
 			NULL, NULL);
 		// launch alert asynchronously
diff --git a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
index e0d9b06a87..0d6b10f5a1 100644
--- a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
+++ b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
@@ -35,8 +35,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-StyledTextImport"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-StyledTextImport"
 //#define CALLED() printf("%s()\n", __FUNCTION__);
 #define CALLED() do {} while (0)
 
diff --git a/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp b/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
index d221318819..029b6b7035 100644
--- a/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
+++ b/src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp
@@ -27,8 +27,8 @@
 #include "SVGExporter.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SVGExport"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SVGExport"
 
 
 // write_line
diff --git a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
index d70503cf2e..1faf39b974 100644
--- a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
+++ b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
@@ -19,8 +19,8 @@
 #include "SVGParser.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SVGImport"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SVGImport"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/shape/PathManipulator.cpp b/src/apps/icon-o-matic/shape/PathManipulator.cpp
index 0bda294226..4a06a510a5 100644
--- a/src/apps/icon-o-matic/shape/PathManipulator.cpp
+++ b/src/apps/icon-o-matic/shape/PathManipulator.cpp
@@ -37,8 +37,8 @@
 #include "TransformPointsBox.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-PathManipulator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-PathManipulator"
 #define POINT_EXTEND 3.0
 #define CONTROL_POINT_EXTEND 2.0
 #define INSERT_DIST_THRESHOLD 7.0
diff --git a/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp b/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
index fea4322fd4..6ded3dd1d0 100644
--- a/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/AddPathsCommand.cpp
@@ -19,8 +19,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AddPathsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AddPathsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/AddPointCommand.cpp b/src/apps/icon-o-matic/shape/commands/AddPointCommand.cpp
index f5abe57034..1da965fc93 100644
--- a/src/apps/icon-o-matic/shape/commands/AddPointCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/AddPointCommand.cpp
@@ -16,8 +16,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AddPointCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AddPointCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/shape/commands/AddShapesCommand.cpp b/src/apps/icon-o-matic/shape/commands/AddShapesCommand.cpp
index a5e0316903..4417130f72 100644
--- a/src/apps/icon-o-matic/shape/commands/AddShapesCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/AddShapesCommand.cpp
@@ -20,8 +20,8 @@
 #include "Shape.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AddShapesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AddShapesCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/AddTransformersCommand.cpp b/src/apps/icon-o-matic/shape/commands/AddTransformersCommand.cpp
index 5c9bafed61..ff5c6f3da0 100644
--- a/src/apps/icon-o-matic/shape/commands/AddTransformersCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/AddTransformersCommand.cpp
@@ -19,8 +19,8 @@
 #include "Shape.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AddTransformersCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AddTransformersCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/ChangePointCommand.cpp b/src/apps/icon-o-matic/shape/commands/ChangePointCommand.cpp
index d2e882e158..ff10c436d5 100644
--- a/src/apps/icon-o-matic/shape/commands/ChangePointCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/ChangePointCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-ChangePointCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-ChangePointCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/CleanUpPathCommand.cpp b/src/apps/icon-o-matic/shape/commands/CleanUpPathCommand.cpp
index 1d26cdcbee..b5d74442fc 100644
--- a/src/apps/icon-o-matic/shape/commands/CleanUpPathCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/CleanUpPathCommand.cpp
@@ -16,8 +16,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-CleanUpPathCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-CleanUpPathCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/shape/commands/FlipPointsCommand.cpp b/src/apps/icon-o-matic/shape/commands/FlipPointsCommand.cpp
index 783bb5140d..9226916b9d 100644
--- a/src/apps/icon-o-matic/shape/commands/FlipPointsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/FlipPointsCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-FlipPointsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-FlipPointsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.cpp b/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.cpp
index 09c15555c4..b7a43f4f3b 100644
--- a/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.cpp
@@ -21,8 +21,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-FreezeTransformationCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-FreezeTransformationCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/InsertPointCommand.cpp b/src/apps/icon-o-matic/shape/commands/InsertPointCommand.cpp
index ad73e09e0c..60543acba3 100644
--- a/src/apps/icon-o-matic/shape/commands/InsertPointCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/InsertPointCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-InsertPointCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-InsertPointCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/MovePathsCommand.cpp b/src/apps/icon-o-matic/shape/commands/MovePathsCommand.cpp
index cff1b6ce11..9ba1faf92f 100644
--- a/src/apps/icon-o-matic/shape/commands/MovePathsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/MovePathsCommand.cpp
@@ -18,8 +18,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-MovePathsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-MovePathsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/MoveShapesCommand.cpp b/src/apps/icon-o-matic/shape/commands/MoveShapesCommand.cpp
index b928a7c4e0..4564b1f457 100644
--- a/src/apps/icon-o-matic/shape/commands/MoveShapesCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/MoveShapesCommand.cpp
@@ -18,8 +18,8 @@
 #include "Shape.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-MoveShapesCommand"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-MoveShapesCommand"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/MoveTransformersCommand.cpp b/src/apps/icon-o-matic/shape/commands/MoveTransformersCommand.cpp
index 5936dea31e..4cb02c68d5 100644
--- a/src/apps/icon-o-matic/shape/commands/MoveTransformersCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/MoveTransformersCommand.cpp
@@ -18,8 +18,8 @@
 #include "Transformer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-MoveTransformersCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-MoveTransformersCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/NudgePointsCommand.cpp b/src/apps/icon-o-matic/shape/commands/NudgePointsCommand.cpp
index ecd8a57adf..d395d41d48 100644
--- a/src/apps/icon-o-matic/shape/commands/NudgePointsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/NudgePointsCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-NudgePointsCommand"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-NudgePointsCommand"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/PathCommand.cpp b/src/apps/icon-o-matic/shape/commands/PathCommand.cpp
index 966ede26dd..80cc315992 100644
--- a/src/apps/icon-o-matic/shape/commands/PathCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/PathCommand.cpp
@@ -16,8 +16,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-PathCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-PathCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/shape/commands/RemovePathsCommand.cpp b/src/apps/icon-o-matic/shape/commands/RemovePathsCommand.cpp
index 34d70f8440..9236a1fd18 100644
--- a/src/apps/icon-o-matic/shape/commands/RemovePathsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/RemovePathsCommand.cpp
@@ -19,8 +19,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RemovePathsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RemovePathsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.cpp b/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.cpp
index dace3ebd3b..7e31f0b643 100644
--- a/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RemovePointsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RemovePointsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/RemoveShapesCommand.cpp b/src/apps/icon-o-matic/shape/commands/RemoveShapesCommand.cpp
index 166c375609..f826569af4 100644
--- a/src/apps/icon-o-matic/shape/commands/RemoveShapesCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/RemoveShapesCommand.cpp
@@ -19,8 +19,8 @@
 #include "Shape.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RemoveShapesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RemoveShapesCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/RemoveTransformersCommand.cpp b/src/apps/icon-o-matic/shape/commands/RemoveTransformersCommand.cpp
index 5aaf936204..b301ca72a3 100644
--- a/src/apps/icon-o-matic/shape/commands/RemoveTransformersCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/RemoveTransformersCommand.cpp
@@ -19,8 +19,8 @@
 #include "Shape.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RemoveTransformersCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RemoveTransformersCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/ReversePathCommand.cpp b/src/apps/icon-o-matic/shape/commands/ReversePathCommand.cpp
index 9e94f543ae..dabf957435 100644
--- a/src/apps/icon-o-matic/shape/commands/ReversePathCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/ReversePathCommand.cpp
@@ -16,8 +16,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-ReversePathCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-ReversePathCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/shape/commands/RotatePathIndicesCommand.cpp b/src/apps/icon-o-matic/shape/commands/RotatePathIndicesCommand.cpp
index 866fe12268..65f3126e79 100644
--- a/src/apps/icon-o-matic/shape/commands/RotatePathIndicesCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/RotatePathIndicesCommand.cpp
@@ -13,8 +13,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RotatePathIndiciesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RotatePathIndiciesCmd"
 
 
 RotatePathIndicesCommand::RotatePathIndicesCommand(VectorPath* path,
diff --git a/src/apps/icon-o-matic/shape/commands/SplitPointsCommand.cpp b/src/apps/icon-o-matic/shape/commands/SplitPointsCommand.cpp
index 80cbbfef70..899af5dce3 100644
--- a/src/apps/icon-o-matic/shape/commands/SplitPointsCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/SplitPointsCommand.cpp
@@ -17,8 +17,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SplitPointsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SplitPointsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/shape/commands/UnassignPathCommand.cpp b/src/apps/icon-o-matic/shape/commands/UnassignPathCommand.cpp
index 8a37d251ae..8d2a5de19f 100644
--- a/src/apps/icon-o-matic/shape/commands/UnassignPathCommand.cpp
+++ b/src/apps/icon-o-matic/shape/commands/UnassignPathCommand.cpp
@@ -16,8 +16,8 @@
 #include "VectorPath.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-UnassignPathCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-UnassignPathCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/style/AddStylesCommand.cpp b/src/apps/icon-o-matic/style/AddStylesCommand.cpp
index 8e541d3287..46d73bb086 100644
--- a/src/apps/icon-o-matic/style/AddStylesCommand.cpp
+++ b/src/apps/icon-o-matic/style/AddStylesCommand.cpp
@@ -19,8 +19,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AddStylesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AddStylesCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
index aa6c9239b4..8a3a56b582 100644
--- a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
+++ b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp
@@ -15,8 +15,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-AssignStyleCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-AssignStyleCmd"
 
 
 // constructor
diff --git a/src/apps/icon-o-matic/style/MoveStylesCommand.cpp b/src/apps/icon-o-matic/style/MoveStylesCommand.cpp
index dd5c9ab898..525f778ba7 100644
--- a/src/apps/icon-o-matic/style/MoveStylesCommand.cpp
+++ b/src/apps/icon-o-matic/style/MoveStylesCommand.cpp
@@ -18,8 +18,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-MoveStylesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-MoveStylesCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/style/RemoveStylesCommand.cpp b/src/apps/icon-o-matic/style/RemoveStylesCommand.cpp
index 6d84e8493e..a4134f75cb 100644
--- a/src/apps/icon-o-matic/style/RemoveStylesCommand.cpp
+++ b/src/apps/icon-o-matic/style/RemoveStylesCommand.cpp
@@ -19,8 +19,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-RemoveStylesCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-RemoveStylesCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/style/SetColorCommand.cpp b/src/apps/icon-o-matic/style/SetColorCommand.cpp
index eefa71e22a..3211894a91 100644
--- a/src/apps/icon-o-matic/style/SetColorCommand.cpp
+++ b/src/apps/icon-o-matic/style/SetColorCommand.cpp
@@ -18,8 +18,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SetColorCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SetColorCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/style/SetGradientCommand.cpp b/src/apps/icon-o-matic/style/SetGradientCommand.cpp
index 20266453b8..97422bbc93 100644
--- a/src/apps/icon-o-matic/style/SetGradientCommand.cpp
+++ b/src/apps/icon-o-matic/style/SetGradientCommand.cpp
@@ -18,8 +18,8 @@
 #include "Style.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-SetGradientCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-SetGradientCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/transformable/ResetTransformationCommand.cpp b/src/apps/icon-o-matic/transformable/ResetTransformationCommand.cpp
index a5899c0aae..863e078629 100644
--- a/src/apps/icon-o-matic/transformable/ResetTransformationCommand.cpp
+++ b/src/apps/icon-o-matic/transformable/ResetTransformationCommand.cpp
@@ -17,8 +17,8 @@
 #include "ChannelTransform.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-ResetTransformationCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-ResetTransformationCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/icon-o-matic/transformable/TransformBoxStates.cpp b/src/apps/icon-o-matic/transformable/TransformBoxStates.cpp
index 6da9b60be5..b98b548ebb 100644
--- a/src/apps/icon-o-matic/transformable/TransformBoxStates.cpp
+++ b/src/apps/icon-o-matic/transformable/TransformBoxStates.cpp
@@ -23,8 +23,8 @@
 #include "TransformBox.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon-O-Matic-TransformationBoxStates"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon-O-Matic-TransformationBoxStates"
 
 
 // constructor
diff --git a/src/apps/installedpackages/UninstallView.cpp b/src/apps/installedpackages/UninstallView.cpp
index 8771b26081..794440b97d 100644
--- a/src/apps/installedpackages/UninstallView.cpp
+++ b/src/apps/installedpackages/UninstallView.cpp
@@ -34,8 +34,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "UninstallView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "UninstallView"
 
 
 enum {
diff --git a/src/apps/installedpackages/UninstallWindow.cpp b/src/apps/installedpackages/UninstallWindow.cpp
index 562b2c63ac..bb1f14adb4 100644
--- a/src/apps/installedpackages/UninstallWindow.cpp
+++ b/src/apps/installedpackages/UninstallWindow.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "UninstallWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "UninstallWindow"
 
 
 UninstallWindow::UninstallWindow()
diff --git a/src/apps/installedpackages/main.cpp b/src/apps/installedpackages/main.cpp
index 56fd2165e4..e1c851fc17 100644
--- a/src/apps/installedpackages/main.cpp
+++ b/src/apps/installedpackages/main.cpp
@@ -21,8 +21,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "UninstallApplication"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "UninstallApplication"
 
 
 class UninstallApplication : public BApplication {
diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp
index 67eecbb64a..1627714162 100644
--- a/src/apps/installer/InstallerApp.cpp
+++ b/src/apps/installer/InstallerApp.cpp
@@ -41,8 +41,8 @@ static const uint32 kMsgAgree = 'agre';
 //"IN THE SOFTWARE.";
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InstallerApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InstallerApp"
 
 
 int main(int, char **)
diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp
index 41146e7367..61ca7b315b 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -45,8 +45,8 @@
 #include "WorkerThread.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InstallerWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InstallerWindow"
 
 
 static const char* kDriveSetupSignature = "application/x-vnd.Haiku-DriveSetup";
diff --git a/src/apps/installer/PackageViews.cpp b/src/apps/installer/PackageViews.cpp
index f1b410be54..364d67515e 100644
--- a/src/apps/installer/PackageViews.cpp
+++ b/src/apps/installer/PackageViews.cpp
@@ -24,8 +24,8 @@
 #include "StringForSize.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackagesView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackagesView"
 
 #define ICON_ATTRIBUTE "INSTALLER PACKAGE: ICON"
 
diff --git a/src/apps/installer/ProgressReporter.cpp b/src/apps/installer/ProgressReporter.cpp
index 7f8c6b5042..af764fca41 100644
--- a/src/apps/installer/ProgressReporter.cpp
+++ b/src/apps/installer/ProgressReporter.cpp
@@ -11,8 +11,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InstallProgress"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InstallProgress"
 
 
 ProgressReporter::ProgressReporter(const BMessenger& messenger,
diff --git a/src/apps/installer/WorkerThread.cpp b/src/apps/installer/WorkerThread.cpp
index e7f9251b5a..73abd112a1 100644
--- a/src/apps/installer/WorkerThread.cpp
+++ b/src/apps/installer/WorkerThread.cpp
@@ -36,7 +36,7 @@
 #include "UnzipEngine.h"
 
 
-#define B_TRANSLATE_CONTEXT "InstallProgress"
+#define B_TRANSLATION_CONTEXT "InstallProgress"
 
 
 //#define COPY_TRACE
diff --git a/src/apps/launchbox/App.cpp b/src/apps/launchbox/App.cpp
index 3481ff0634..c13756b2d2 100644
--- a/src/apps/launchbox/App.cpp
+++ b/src/apps/launchbox/App.cpp
@@ -16,8 +16,8 @@
 
 #include "MainWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 
 App::App()
 	:
diff --git a/src/apps/launchbox/LaunchButton.cpp b/src/apps/launchbox/LaunchButton.cpp
index c39d50666f..d22be5eb68 100644
--- a/src/apps/launchbox/LaunchButton.cpp
+++ b/src/apps/launchbox/LaunchButton.cpp
@@ -26,8 +26,8 @@
 #include "MainWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 
 
 static const float kDragStartDist = 10.0;
diff --git a/src/apps/launchbox/MainWindow.cpp b/src/apps/launchbox/MainWindow.cpp
index 76f4c45227..448a99e97a 100644
--- a/src/apps/launchbox/MainWindow.cpp
+++ b/src/apps/launchbox/MainWindow.cpp
@@ -26,8 +26,8 @@
 #include "PadView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 MainWindow::MainWindow(const char* name, BRect frame, bool addDefaultButtons)
 	:
 	BWindow(frame, name, B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
diff --git a/src/apps/launchbox/NamePanel.cpp b/src/apps/launchbox/NamePanel.cpp
index db931e7973..e0d556709f 100644
--- a/src/apps/launchbox/NamePanel.cpp
+++ b/src/apps/launchbox/NamePanel.cpp
@@ -13,8 +13,8 @@
 
 #include "NamePanel.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 
 
 enum {
diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp
index aa24e4661d..eb80d10d2a 100644
--- a/src/apps/launchbox/PadView.cpp
+++ b/src/apps/launchbox/PadView.cpp
@@ -21,8 +21,8 @@
 #include "MainWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 
 
 static bigtime_t sActivationDelay = 40000;
diff --git a/src/apps/login/DesktopWindow.cpp b/src/apps/login/DesktopWindow.cpp
index aa9b95cb56..f0add9d69e 100644
--- a/src/apps/login/DesktopWindow.cpp
+++ b/src/apps/login/DesktopWindow.cpp
@@ -18,8 +18,8 @@
 #include "LoginApp.h"
 #include "DesktopWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Desktop Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Desktop Window"
 
 const window_feel kPrivateDesktopWindowFeel = window_feel(1024);
 const window_look kPrivateDesktopWindowLook = window_look(4);
diff --git a/src/apps/login/LoginApp.cpp b/src/apps/login/LoginApp.cpp
index 9207726986..a8771b1a67 100644
--- a/src/apps/login/LoginApp.cpp
+++ b/src/apps/login/LoginApp.cpp
@@ -26,8 +26,8 @@
 #include "multiuser_utils.h"
 #endif
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Login App"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Login App"
 
 const char *kLoginAppSig = "application/x-vnd.Haiku-Login";
 
diff --git a/src/apps/login/LoginView.cpp b/src/apps/login/LoginView.cpp
index fe64e7a9d4..d91fd76379 100644
--- a/src/apps/login/LoginView.cpp
+++ b/src/apps/login/LoginView.cpp
@@ -15,8 +15,8 @@
 #include "LoginApp.h"
 #include "LoginView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Login View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Login View"
 
 #define LW 120
 #define CSEP 15
diff --git a/src/apps/login/LoginWindow.cpp b/src/apps/login/LoginWindow.cpp
index 40a7729275..9d7b5469dd 100644
--- a/src/apps/login/LoginWindow.cpp
+++ b/src/apps/login/LoginWindow.cpp
@@ -9,8 +9,8 @@
 #include "LoginWindow.h"
 #include "LoginView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Login Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Login Window"
 
 #define WINDOW_FEEL B_NORMAL_WINDOW_FEEL
 //#define WINDOW_FEEL B_FLOATING_ALL_WINDOW_FEEL
diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp
index 288e3c667d..979e1a4cf7 100644
--- a/src/apps/magnify/Magnify.cpp
+++ b/src/apps/magnify/Magnify.cpp
@@ -36,8 +36,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Magnify-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Magnify-Main"
 
 
 const int32 msg_help = 'help';
@@ -751,8 +751,8 @@ TWindow::PixelSize()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Magnify-Help"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Magnify-Help"
 
 
 void
@@ -827,8 +827,8 @@ TWindow::ShowHelp()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Magnify-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Magnify-Main"
 
 
 bool
@@ -1529,7 +1529,7 @@ TMagnify::CopyImage()
 
 	BMessage *message = be_clipboard->Data();
 	if (!message) {
-		printf(B_TRANSLATE_WITH_CONTEXT("no clip msg\n", 
+		printf(B_TRANSLATE_CONTEXT("no clip msg\n", 
 			"In console, when clipboard is empty after clicking Copy image"));
 		return;
 	}
@@ -2066,7 +2066,7 @@ main(int argc, char* argv[])
 	int32 pixelCount = -1;
 
 	if (argc > 2) {
-		printf(B_TRANSLATE_WITH_CONTEXT(
+		printf(B_TRANSLATE_CONTEXT(
 			"usage: magnify [size] (magnify size * size pixels)\n", 
 			"Console"));
 		exit(1);
@@ -2075,17 +2075,17 @@ main(int argc, char* argv[])
 			pixelCount = abs(atoi(argv[1]));
 
 			if ((pixelCount > 100) || (pixelCount < 4)) {
-				printf(B_TRANSLATE_WITH_CONTEXT(
+				printf(B_TRANSLATE_CONTEXT(
 					"usage: magnify [size] (magnify size * size pixels)\n", 
 					"Console"));
-				printf(B_TRANSLATE_WITH_CONTEXT(
+				printf(B_TRANSLATE_CONTEXT(
 					"  size must be > 4 and a multiple of 4\n", 
 					"Console"));
 				exit(1);
 			}
 
 			if (pixelCount % 4) {
-				printf(B_TRANSLATE_WITH_CONTEXT(
+				printf(B_TRANSLATE_CONTEXT(
 					"magnify: size must be a multiple of 4\n", 
 					"Console"));
 				exit(1);
diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index 036e77f484..e3390d23be 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -79,7 +79,7 @@ of their respective holders. All rights reserved.
 #endif
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 const rgb_color kNormalTextColor = {0, 0, 0, 255};
diff --git a/src/apps/mail/Enclosures.cpp b/src/apps/mail/Enclosures.cpp
index f55dbe12fd..469fa1d155 100644
--- a/src/apps/mail/Enclosures.cpp
+++ b/src/apps/mail/Enclosures.cpp
@@ -64,7 +64,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 static const float kPlainFontSizeScale = 0.9;
diff --git a/src/apps/mail/Enclosures.h b/src/apps/mail/Enclosures.h
index e60676afba..a66a2e64e4 100644
--- a/src/apps/mail/Enclosures.h
+++ b/src/apps/mail/Enclosures.h
@@ -51,7 +51,7 @@ All rights reserved.
 
 #define ENCLOSURES_HEIGHT	65
 
-#define ENCLOSE_TEXT		B_TRANSLATE_WITH_CONTEXT("Attachments:", "Mail")
+#define ENCLOSE_TEXT		B_TRANSLATE_CONTEXT("Attachments:", "Mail")
 #define ENCLOSE_TEXT_H		7
 #define ENCLOSE_TEXT_V		3
 #define ENCLOSE_FIELD_V		3
diff --git a/src/apps/mail/FindWindow.cpp b/src/apps/mail/FindWindow.cpp
index 78d33d368a..c5cbee3b80 100644
--- a/src/apps/mail/FindWindow.cpp
+++ b/src/apps/mail/FindWindow.cpp
@@ -51,7 +51,7 @@ of their respective holders. All rights reserved.
 #include 
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 enum {
diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp
index 40681bfb64..b386d1bbc9 100644
--- a/src/apps/mail/Header.cpp
+++ b/src/apps/mail/Header.cpp
@@ -70,7 +70,7 @@ of their respective holders. All rights reserved.
 #include 
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 using namespace BPrivate;
diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp
index 90a95446fa..71d836589a 100644
--- a/src/apps/mail/MailApp.cpp
+++ b/src/apps/mail/MailApp.cpp
@@ -89,7 +89,7 @@ using namespace BPrivate ;
 #include "Words.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 static const char *kDictDirectory = "word_dictionary";
diff --git a/src/apps/mail/MailPopUpMenu.cpp b/src/apps/mail/MailPopUpMenu.cpp
index e549156729..e61f32bcf3 100644
--- a/src/apps/mail/MailPopUpMenu.cpp
+++ b/src/apps/mail/MailPopUpMenu.cpp
@@ -47,7 +47,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 TMenu::TMenu(const char *name, const char *attribute, int32 message, bool popup,
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index fc1a876926..d06867f427 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -87,7 +87,7 @@ of their respective holders. All rights reserved.
 #include "Utilities.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 using namespace BPrivate;
diff --git a/src/apps/mail/Prefs.cpp b/src/apps/mail/Prefs.cpp
index 8b1ceda142..2edb2081b9 100644
--- a/src/apps/mail/Prefs.cpp
+++ b/src/apps/mail/Prefs.cpp
@@ -61,7 +61,7 @@ using namespace BPrivate;
 #include "Signature.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 #define BUTTON_WIDTH		70
 #define BUTTON_HEIGHT		20
diff --git a/src/apps/mail/Settings.cpp b/src/apps/mail/Settings.cpp
index b2c3aea007..77ffeb97c5 100644
--- a/src/apps/mail/Settings.cpp
+++ b/src/apps/mail/Settings.cpp
@@ -54,7 +54,7 @@ of their respective holders. All rights reserved.
 #include 
 
 
-#define B_TRANSLATE_CONTEXT "Settings"
+#define B_TRANSLATION_CONTEXT "Settings"
 
 
 using namespace BPrivate ;
diff --git a/src/apps/mail/Signature.cpp b/src/apps/mail/Signature.cpp
index f5037715a3..405bb69525 100644
--- a/src/apps/mail/Signature.cpp
+++ b/src/apps/mail/Signature.cpp
@@ -50,7 +50,7 @@ of their respective holders. All rights reserved.
 #include "Messages.h"
 
 
-#define B_TRANSLATE_CONTEXT "Mail"
+#define B_TRANSLATION_CONTEXT "Mail"
 
 
 extern BRect		signature_window;
diff --git a/src/apps/mandelbrot/Mandelbrot.cpp b/src/apps/mandelbrot/Mandelbrot.cpp
index 239903a984..f34eed0af0 100644
--- a/src/apps/mandelbrot/Mandelbrot.cpp
+++ b/src/apps/mandelbrot/Mandelbrot.cpp
@@ -21,8 +21,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Mandelbrot"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Mandelbrot"
 
 
 /* Those are the menu item id's of the main window */
diff --git a/src/apps/mediaconverter/MediaConverterApp.cpp b/src/apps/mediaconverter/MediaConverterApp.cpp
index 14419668b4..f9397d5d2f 100644
--- a/src/apps/mediaconverter/MediaConverterApp.cpp
+++ b/src/apps/mediaconverter/MediaConverterApp.cpp
@@ -25,8 +25,8 @@
 #include "MessageConstants.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaConverter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaConverter"
 
 
 const char APP_SIGNATURE[] = "application/x-vnd.Haiku-MediaConverter";
diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp
index 58d644bbb5..2d1cc7e8cf 100644
--- a/src/apps/mediaconverter/MediaConverterWindow.cpp
+++ b/src/apps/mediaconverter/MediaConverterWindow.cpp
@@ -36,8 +36,8 @@
 #include "MessageConstants.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaConverter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaConverter"
 #define VERSION "1.3.0"
 
 
@@ -519,7 +519,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 		== B_OK) {
 		if (separator) {
 			menu->AddItem(new BMenuItem(
-				B_TRANSLATE_WITH_CONTEXT("No audio", "Audio codecs list"),
+				B_TRANSLATE_CONTEXT("No audio", "Audio codecs list"),
 				new BMessage(AUDIO_CODEC_SELECT_MESSAGE)));
 			menu->AddSeparatorItem();
 			separator = false;
@@ -543,7 +543,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 		((BInvoker *)item)->Invoke();
 	} else {
 		item = new BMenuItem(
-			B_TRANSLATE_WITH_CONTEXT("None available", "Audio codecs"),
+			B_TRANSLATE_CONTEXT("None available", "Audio codecs"),
 			NULL);
 		menu->AddItem(item);
 		item->SetMarked(true);
@@ -575,7 +575,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 	while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) {
 		if (separator) {
 			menu->AddItem(new BMenuItem(
-				B_TRANSLATE_WITH_CONTEXT("No video", "Video codecs list"),
+				B_TRANSLATE_CONTEXT("No video", "Video codecs list"),
 				new BMessage(VIDEO_CODEC_SELECT_MESSAGE)));
 			menu->AddSeparatorItem();
 			separator = false;
@@ -594,7 +594,7 @@ MediaConverterWindow::BuildAudioVideoMenus()
 		((BInvoker *)item)->Invoke();
 	} else {
 		item = new BMenuItem(
-			B_TRANSLATE_WITH_CONTEXT("None available", "Video codecs"), 
+			B_TRANSLATE_CONTEXT("None available", "Video codecs"), 
 			NULL);
 		menu->AddItem(item);
 		item->SetMarked(true);
@@ -912,13 +912,13 @@ MediaConverterWindow::_CreateMenu()
 	BMenuItem* item;
 	BMenu* menu;
 
-	menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("File", "Menu"));
-	item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT(
+	menu = new BMenu(B_TRANSLATE_CONTEXT("File", "Menu"));
+	item = new BMenuItem(B_TRANSLATE_CONTEXT(
 		"Open" B_UTF8_ELLIPSIS, "Menu"),
 		new BMessage(OPEN_FILE_MESSAGE), 'O');
 	menu->AddItem(item);
 	menu->AddSeparatorItem();
-	item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT("Quit", "Menu"), 
+	item = new BMenuItem(B_TRANSLATE_CONTEXT("Quit", "Menu"), 
 		new BMessage(QUIT_MESSAGE), 'Q');
 	menu->AddItem(item);
 
diff --git a/src/apps/mediaconverter/MediaEncoderWindow.cpp b/src/apps/mediaconverter/MediaEncoderWindow.cpp
index 9be18915bf..2272ddd170 100644
--- a/src/apps/mediaconverter/MediaEncoderWindow.cpp
+++ b/src/apps/mediaconverter/MediaEncoderWindow.cpp
@@ -11,8 +11,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaConverter-EncoderWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaConverter-EncoderWindow"
 
 
 MediaEncoderWindow::MediaEncoderWindow(BRect frame, BView* view)
diff --git a/src/apps/mediaconverter/MediaFileInfo.cpp b/src/apps/mediaconverter/MediaFileInfo.cpp
index 957925dcc4..0dd1b5e1dc 100644
--- a/src/apps/mediaconverter/MediaFileInfo.cpp
+++ b/src/apps/mediaconverter/MediaFileInfo.cpp
@@ -11,8 +11,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaFileInfo"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaFileInfo"
 
 MediaFileInfo::MediaFileInfo(BMediaFile* file)
 {
diff --git a/src/apps/mediaconverter/MediaFileInfoView.cpp b/src/apps/mediaconverter/MediaFileInfoView.cpp
index 7eae04aac0..6cd20e5d00 100644
--- a/src/apps/mediaconverter/MediaFileInfoView.cpp
+++ b/src/apps/mediaconverter/MediaFileInfoView.cpp
@@ -13,8 +13,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaConverter-FileInfo"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaConverter-FileInfo"
 
 
 const float kSpacing = 5.0f;
diff --git a/src/apps/mediaplayer/InfoWin.cpp b/src/apps/mediaplayer/InfoWin.cpp
index 58622bbb54..a98f3ceac4 100644
--- a/src/apps/mediaplayer/InfoWin.cpp
+++ b/src/apps/mediaplayer/InfoWin.cpp
@@ -51,8 +51,8 @@ const rgb_color kBlue =  {   0,   0, 220, 255 };
 const rgb_color kGreen = { 171, 221, 161, 255 };
 const rgb_color kBlack = {   0,   0,   0, 255 };
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-InfoWin"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-InfoWin"
 
 // should later draw an icon
 class InfoView : public BView {
diff --git a/src/apps/mediaplayer/MainApp.cpp b/src/apps/mediaplayer/MainApp.cpp
index 71ccf10127..427de760d8 100644
--- a/src/apps/mediaplayer/MainApp.cpp
+++ b/src/apps/mediaplayer/MainApp.cpp
@@ -45,8 +45,8 @@
 #include "SettingsWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-Main"
 
 
 static const char* kCurrentPlaylistFilename = "MediaPlayer Current Playlist";
diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index 4aaf5d9ff9..fb05b84fdb 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -61,8 +61,8 @@
 #include "Settings.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-Main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-Main"
 #define MIN_WIDTH 250
 
 
@@ -1424,9 +1424,9 @@ MainWin::_CreateMenu()
 	fAudioMenu = new BMenu(B_TRANSLATE("Audio"));
 	fVideoMenu = new BMenu(B_TRANSLATE("Video"));
 	fVideoAspectMenu = new BMenu(B_TRANSLATE("Aspect ratio"));
-	fAudioTrackMenu = new BMenu(B_TRANSLATE_WITH_CONTEXT("Track",
+	fAudioTrackMenu = new BMenu(B_TRANSLATE_CONTEXT("Track",
 		"Audio Track Menu"));
-	fVideoTrackMenu = new BMenu(B_TRANSLATE_WITH_CONTEXT("Track",
+	fVideoTrackMenu = new BMenu(B_TRANSLATE_CONTEXT("Track",
 		"Video Track Menu"));
 	fSubTitleTrackMenu = new BMenu(B_TRANSLATE("Subtitles"));
 	fAttributesMenu = new BMenu(B_TRANSLATE("Attributes"));
@@ -1616,7 +1616,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
 		audioTrackMenu->AddItem(item);
 	}
 	if (count == 0) {
-		audioTrackMenu->AddItem(new BMenuItem(B_TRANSLATE_WITH_CONTEXT("none",
+		audioTrackMenu->AddItem(new BMenuItem(B_TRANSLATE_CONTEXT("none",
 			"Audio track menu"), new BMessage(M_DUMMY)));
 		audioTrackMenu->ItemAt(0)->SetMarked(true);
 	}
@@ -1640,7 +1640,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
 	if (count > 0) {
 		current = fController->CurrentSubTitleTrack();
 		BMenuItem* item = new BMenuItem(
-			B_TRANSLATE_WITH_CONTEXT("Off", "Subtitles menu"),
+			B_TRANSLATE_CONTEXT("Off", "Subtitles menu"),
 			new BMessage(M_SELECT_SUB_TITLE_TRACK - 1));
 		subTitleTrackMenu->AddItem(item);
 		item->SetMarked(current == -1);
@@ -1660,7 +1660,7 @@ MainWin::_SetupTrackMenus(BMenu* audioTrackMenu, BMenu* videoTrackMenu,
 		}
 	} else {
 		subTitleTrackMenu->AddItem(new BMenuItem(
-			B_TRANSLATE_WITH_CONTEXT("none", "Subtitles menu"),
+			B_TRANSLATE_CONTEXT("none", "Subtitles menu"),
 			new BMessage(M_DUMMY)));
 		subTitleTrackMenu->ItemAt(0)->SetMarked(true);
 	}
diff --git a/src/apps/mediaplayer/interface/PeakView.cpp b/src/apps/mediaplayer/interface/PeakView.cpp
index 6bb6bb96b9..86426c7945 100644
--- a/src/apps/mediaplayer/interface/PeakView.cpp
+++ b/src/apps/mediaplayer/interface/PeakView.cpp
@@ -25,8 +25,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-PeakView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-PeakView"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/playlist/CopyPLItemsCommand.cpp b/src/apps/mediaplayer/playlist/CopyPLItemsCommand.cpp
index f9774a93d3..f2862b70ef 100644
--- a/src/apps/mediaplayer/playlist/CopyPLItemsCommand.cpp
+++ b/src/apps/mediaplayer/playlist/CopyPLItemsCommand.cpp
@@ -14,8 +14,8 @@
 #include "Playlist.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-CopyPLItemsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-CopyPLItemsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp b/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp
index d7944a74de..236630bc6d 100644
--- a/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp
+++ b/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp
@@ -17,8 +17,8 @@
 #include "PlaylistItem.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-ImportPLItemsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-ImportPLItemsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/playlist/MovePLItemsCommand.cpp b/src/apps/mediaplayer/playlist/MovePLItemsCommand.cpp
index 109b305336..c40127cb80 100644
--- a/src/apps/mediaplayer/playlist/MovePLItemsCommand.cpp
+++ b/src/apps/mediaplayer/playlist/MovePLItemsCommand.cpp
@@ -15,8 +15,8 @@
 #include "Playlist.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-MovePLItemsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-MovePLItemsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/playlist/PlaylistItem.cpp b/src/apps/mediaplayer/playlist/PlaylistItem.cpp
index 068f1e9c5a..fde90a89c8 100644
--- a/src/apps/mediaplayer/playlist/PlaylistItem.cpp
+++ b/src/apps/mediaplayer/playlist/PlaylistItem.cpp
@@ -11,8 +11,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-PlaylistItem"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-PlaylistItem"
 
 
 PlaylistItem::Listener::Listener()
@@ -62,7 +62,7 @@ PlaylistItem::Name() const
 {
 	BString name;
 	if (GetAttribute(ATTR_STRING_NAME, name) != B_OK)
-		name = B_TRANSLATE_WITH_CONTEXT("", "PlaylistItem-name");
+		name = B_TRANSLATE_CONTEXT("", "PlaylistItem-name");
 	return name;
 }
 
@@ -72,7 +72,7 @@ PlaylistItem::Author() const
 {
 	BString author;
 	if (GetAttribute(ATTR_STRING_AUTHOR, author) != B_OK)
-		author = B_TRANSLATE_WITH_CONTEXT("", "PlaylistItem-author");
+		author = B_TRANSLATE_CONTEXT("", "PlaylistItem-author");
 	return author;
 }
 
@@ -82,7 +82,7 @@ PlaylistItem::Album() const
 {
 	BString album;
 	if (GetAttribute(ATTR_STRING_ALBUM, album) != B_OK)
-		album = B_TRANSLATE_WITH_CONTEXT("", "PlaylistItem-album");
+		album = B_TRANSLATE_CONTEXT("", "PlaylistItem-album");
 	return album;
 }
 
@@ -92,7 +92,7 @@ PlaylistItem::Title() const
 {
 	BString title;
 	if (GetAttribute(ATTR_STRING_TITLE, title) != B_OK)
-		title = B_TRANSLATE_WITH_CONTEXT("", "PlaylistItem-title");
+		title = B_TRANSLATE_CONTEXT("", "PlaylistItem-title");
 	return title;
 }
 
diff --git a/src/apps/mediaplayer/playlist/PlaylistWindow.cpp b/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
index 6edb631676..8e4d9f1499 100644
--- a/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
+++ b/src/apps/mediaplayer/playlist/PlaylistWindow.cpp
@@ -38,8 +38,8 @@
 #include "RWLocker.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-PlaylistWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-PlaylistWindow"
 
 
 // TODO:
diff --git a/src/apps/mediaplayer/playlist/RandomizePLItemsCommand.cpp b/src/apps/mediaplayer/playlist/RandomizePLItemsCommand.cpp
index bdadb89018..3f9ad41129 100644
--- a/src/apps/mediaplayer/playlist/RandomizePLItemsCommand.cpp
+++ b/src/apps/mediaplayer/playlist/RandomizePLItemsCommand.cpp
@@ -16,8 +16,8 @@
 #include "Playlist.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-RandomizePLItemsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-RandomizePLItemsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp b/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
index c762ef891a..a872bc3167 100644
--- a/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
+++ b/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
@@ -16,8 +16,8 @@
 #include "Playlist.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-RemovePLItemsCmd"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-RemovePLItemsCmd"
 
 
 using std::nothrow;
diff --git a/src/apps/mediaplayer/settings/SettingsWindow.cpp b/src/apps/mediaplayer/settings/SettingsWindow.cpp
index bd3258a5e2..989acc6c1d 100644
--- a/src/apps/mediaplayer/settings/SettingsWindow.cpp
+++ b/src/apps/mediaplayer/settings/SettingsWindow.cpp
@@ -27,8 +27,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaPlayer-SettingsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaPlayer-SettingsWindow"
 
 
 enum {
diff --git a/src/apps/midiplayer/MidiPlayerApp.cpp b/src/apps/midiplayer/MidiPlayerApp.cpp
index 3e2fb8a005..0450d2790c 100644
--- a/src/apps/midiplayer/MidiPlayerApp.cpp
+++ b/src/apps/midiplayer/MidiPlayerApp.cpp
@@ -28,8 +28,8 @@
 #include "MidiPlayerApp.h"
 #include "MidiPlayerWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main Application"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main Application"
 
 MidiPlayerApp::MidiPlayerApp()
 	: BApplication(MIDI_PLAYER_SIGNATURE)
diff --git a/src/apps/midiplayer/MidiPlayerWindow.cpp b/src/apps/midiplayer/MidiPlayerWindow.cpp
index 5d6ded7f55..3479e8f53a 100644
--- a/src/apps/midiplayer/MidiPlayerWindow.cpp
+++ b/src/apps/midiplayer/MidiPlayerWindow.cpp
@@ -40,8 +40,8 @@
 #define _H(a) (a->Frame().Height())
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main Window"
 
 
 MidiPlayerWindow::MidiPlayerWindow()
diff --git a/src/apps/midiplayer/ScopeView.cpp b/src/apps/midiplayer/ScopeView.cpp
index 4f68e9c083..d1efdb5de2 100644
--- a/src/apps/midiplayer/ScopeView.cpp
+++ b/src/apps/midiplayer/ScopeView.cpp
@@ -27,8 +27,8 @@
 
 #include "ScopeView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Scope View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Scope View"
 
 
 //------------------------------------------------------------------------------
diff --git a/src/apps/networkstatus/NetworkStatus.cpp b/src/apps/networkstatus/NetworkStatus.cpp
index 8dcace6965..b7a9897ec6 100644
--- a/src/apps/networkstatus/NetworkStatus.cpp
+++ b/src/apps/networkstatus/NetworkStatus.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NetworkStatus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NetworkStatus"
 
 
 class NetworkStatus : public BApplication {
diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp
index 967f432d2f..69d149567c 100644
--- a/src/apps/networkstatus/NetworkStatusView.cpp
+++ b/src/apps/networkstatus/NetworkStatusView.cpp
@@ -49,8 +49,8 @@
 #include "WirelessNetworkMenuItem.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NetworkStatusView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NetworkStatusView"
 
 
 static const char *kStatusDescriptions[] = {
diff --git a/src/apps/networkstatus/NetworkStatusWindow.cpp b/src/apps/networkstatus/NetworkStatusWindow.cpp
index 3ee0ea7d7c..3420b21f0a 100644
--- a/src/apps/networkstatus/NetworkStatusWindow.cpp
+++ b/src/apps/networkstatus/NetworkStatusWindow.cpp
@@ -14,8 +14,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NetworkStatusWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NetworkStatusWindow"
 
 
 NetworkStatusWindow::NetworkStatusWindow()
diff --git a/src/apps/overlayimage/OverlayView.cpp b/src/apps/overlayimage/OverlayView.cpp
index 5b9ff38237..9efac70e15 100644
--- a/src/apps/overlayimage/OverlayView.cpp
+++ b/src/apps/overlayimage/OverlayView.cpp
@@ -19,8 +19,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main view"
 
 const float kDraggerSize = 7;
 	
diff --git a/src/apps/overlayimage/OverlayWindow.cpp b/src/apps/overlayimage/OverlayWindow.cpp
index 194237f8b3..ade428d5df 100644
--- a/src/apps/overlayimage/OverlayWindow.cpp
+++ b/src/apps/overlayimage/OverlayWindow.cpp
@@ -19,8 +19,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main window"
 
 
 OverlayWindow::OverlayWindow() 
diff --git a/src/apps/packageinstaller/PackageImageViewer.cpp b/src/apps/packageinstaller/PackageImageViewer.cpp
index 9dd73f8ff6..ea3e5124f2 100644
--- a/src/apps/packageinstaller/PackageImageViewer.cpp
+++ b/src/apps/packageinstaller/PackageImageViewer.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageImageViewer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageImageViewer"
 
 enum {
 	P_MSG_CLOSE = 'pmic'
diff --git a/src/apps/packageinstaller/PackageInfo.cpp b/src/apps/packageinstaller/PackageInfo.cpp
index 7e1c7e7b2c..d8bfdd0f6f 100644
--- a/src/apps/packageinstaller/PackageInfo.cpp
+++ b/src/apps/packageinstaller/PackageInfo.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageInfo"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageInfo"
 
 #define RETURN_AND_SET_STATUS(err) fStatus = err; \
 	fprintf(stderr, "err at %s():%d: %x\n", __FUNCTION__, __LINE__, err); \
diff --git a/src/apps/packageinstaller/PackageInstall.cpp b/src/apps/packageinstaller/PackageInstall.cpp
index a6b170fefe..a779e1b6b1 100644
--- a/src/apps/packageinstaller/PackageInstall.cpp
+++ b/src/apps/packageinstaller/PackageInstall.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageInstall"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageInstall"
 
 
 static int32
diff --git a/src/apps/packageinstaller/PackageItem.cpp b/src/apps/packageinstaller/PackageItem.cpp
index a17ed39783..1fb13a1fbb 100644
--- a/src/apps/packageinstaller/PackageItem.cpp
+++ b/src/apps/packageinstaller/PackageItem.cpp
@@ -25,8 +25,8 @@
 #include "zlib.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageItem"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageItem"
 
 enum {
 	P_CHUNK_SIZE = 256
diff --git a/src/apps/packageinstaller/PackageStatus.cpp b/src/apps/packageinstaller/PackageStatus.cpp
index 98550023ad..f356880035 100644
--- a/src/apps/packageinstaller/PackageStatus.cpp
+++ b/src/apps/packageinstaller/PackageStatus.cpp
@@ -18,8 +18,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageStatus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageStatus"
 
 StopButton::StopButton()
 	:
diff --git a/src/apps/packageinstaller/PackageTextViewer.cpp b/src/apps/packageinstaller/PackageTextViewer.cpp
index 89d970136c..482552bc8f 100644
--- a/src/apps/packageinstaller/PackageTextViewer.cpp
+++ b/src/apps/packageinstaller/PackageTextViewer.cpp
@@ -23,8 +23,8 @@ enum {
 	P_MSG_DECLINE
 };
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageTextViewer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageTextViewer"
 
 
 PackageTextViewer::PackageTextViewer(const char *text, bool disclaimer)
diff --git a/src/apps/packageinstaller/PackageView.cpp b/src/apps/packageinstaller/PackageView.cpp
index e65a029d0d..8575454e33 100644
--- a/src/apps/packageinstaller/PackageView.cpp
+++ b/src/apps/packageinstaller/PackageView.cpp
@@ -35,8 +35,8 @@
 #include  // For debugging
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageView"
 
 const float kMaxDescHeight = 125.0f;
 const uint32 kSeparatorIndex = 3;
diff --git a/src/apps/packageinstaller/PackageWindow.cpp b/src/apps/packageinstaller/PackageWindow.cpp
index 13d2d8fffb..cca48365f3 100644
--- a/src/apps/packageinstaller/PackageWindow.cpp
+++ b/src/apps/packageinstaller/PackageWindow.cpp
@@ -15,8 +15,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PackageWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PackageWindow"
 
 
 PackageWindow::PackageWindow(const entry_ref *ref)
diff --git a/src/apps/packageinstaller/main.cpp b/src/apps/packageinstaller/main.cpp
index 23b3810db8..31ef5084a1 100644
--- a/src/apps/packageinstaller/main.cpp
+++ b/src/apps/packageinstaller/main.cpp
@@ -21,8 +21,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Packageinstaller main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Packageinstaller main"
 
 class PackageInstaller : public BApplication {
 	public:
diff --git a/src/apps/packagemanager/PackageManager.cpp b/src/apps/packagemanager/PackageManager.cpp
index d9d2cb08d5..b5fa5fbb0d 100644
--- a/src/apps/packagemanager/PackageManager.cpp
+++ b/src/apps/packagemanager/PackageManager.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 
 class PackageManager : public BApplication {
diff --git a/src/apps/pairs/PairsView.cpp b/src/apps/pairs/PairsView.cpp
index 1041b03409..5a68a38bdb 100644
--- a/src/apps/pairs/PairsView.cpp
+++ b/src/apps/pairs/PairsView.cpp
@@ -92,8 +92,8 @@ PairsView::_HasBitmap(BList& bitmaps, BBitmap* bitmap)
 	return false;
 }
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PairsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PairsView"
 
 void
 PairsView::_ReadRandomIcons()
diff --git a/src/apps/pairs/PairsWindow.cpp b/src/apps/pairs/PairsWindow.cpp
index a78fddfe38..5679b7150c 100644
--- a/src/apps/pairs/PairsWindow.cpp
+++ b/src/apps/pairs/PairsWindow.cpp
@@ -28,8 +28,8 @@
 // #pragma mark - PairsWindow
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PairsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PairsWindow"
 
 const uint32 MENU_NEW					= 'MGnw';
 const uint32 MENU_SIZE					= 'MGsz';
diff --git a/src/apps/people/AttributeTextControl.cpp b/src/apps/people/AttributeTextControl.cpp
index c01cc72413..ff1694c261 100644
--- a/src/apps/people/AttributeTextControl.cpp
+++ b/src/apps/people/AttributeTextControl.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "People"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "People"
 
 
 AttributeTextControl::AttributeTextControl(const char* label,
diff --git a/src/apps/people/PeopleApp.cpp b/src/apps/people/PeopleApp.cpp
index 2f4ba5b019..41a3a36436 100644
--- a/src/apps/people/PeopleApp.cpp
+++ b/src/apps/people/PeopleApp.cpp
@@ -34,8 +34,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "People"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "People"
 
 
 struct DefaultAttribute {
@@ -147,9 +147,9 @@ TPeopleApp::TPeopleApp()
 	}
 	if (!valid) {
 		mime.Install();
-		mime.SetShortDescription(B_TRANSLATE_WITH_CONTEXT("Person",
+		mime.SetShortDescription(B_TRANSLATE_CONTEXT("Person",
 			"Short mimetype description"));
-		mime.SetLongDescription(B_TRANSLATE_WITH_CONTEXT(
+		mime.SetLongDescription(B_TRANSLATE_CONTEXT(
 			"Contact information for a person.",
 			"Long mimetype description"));
 		mime.SetIcon(kPersonIcon, sizeof(kPersonIcon));
diff --git a/src/apps/people/PersonView.cpp b/src/apps/people/PersonView.cpp
index 7d174e6aa1..9dc3165ef1 100644
--- a/src/apps/people/PersonView.cpp
+++ b/src/apps/people/PersonView.cpp
@@ -37,8 +37,8 @@
 #include "PictureView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "People"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "People"
 
 
 PersonView::PersonView(const char* name, const char* categoryAttribute,
@@ -257,7 +257,7 @@ PersonView::BuildGroupMenu()
 
 	if (count == 0) {
 		fGroups->AddItem(item = new BMenuItem(
-			B_TRANSLATE_WITH_CONTEXT("none", "Groups list"),
+			B_TRANSLATE_CONTEXT("none", "Groups list"),
 			new BMessage(M_GROUP_MENU)));
 		item->SetEnabled(false);
 	}
diff --git a/src/apps/people/PersonWindow.cpp b/src/apps/people/PersonWindow.cpp
index f4df5f8143..291b1df6b9 100644
--- a/src/apps/people/PersonWindow.cpp
+++ b/src/apps/people/PersonWindow.cpp
@@ -37,8 +37,8 @@
 #include "PersonView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "People"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "People"
 
 
 PersonWindow::PersonWindow(BRect frame, const char* title,
diff --git a/src/apps/people/PictureView.cpp b/src/apps/people/PictureView.cpp
index e0bb44fc90..90b97b5605 100644
--- a/src/apps/people/PictureView.cpp
+++ b/src/apps/people/PictureView.cpp
@@ -37,8 +37,8 @@
 #include "PeopleApp.h"	// for B_PERSON_MIMETYPE
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "People"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "People"
 
 
 const uint32 kMsgPopUpMenuClosed = 'pmcl';
diff --git a/src/apps/poorman/PoorManAdvancedView.cpp b/src/apps/poorman/PoorManAdvancedView.cpp
index 370c3ebb79..10ef09a8ca 100644
--- a/src/apps/poorman/PoorManAdvancedView.cpp
+++ b/src/apps/poorman/PoorManAdvancedView.cpp
@@ -15,8 +15,8 @@
 #include "PoorManApplication.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoorMan"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoorMan"
 
 
 PoorManAdvancedView::PoorManAdvancedView(BRect rect, const char *name)
diff --git a/src/apps/poorman/PoorManLoggingView.cpp b/src/apps/poorman/PoorManLoggingView.cpp
index 9b7f957098..2f52c40a39 100644
--- a/src/apps/poorman/PoorManLoggingView.cpp
+++ b/src/apps/poorman/PoorManLoggingView.cpp
@@ -15,8 +15,8 @@
 #include "PoorManLoggingView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoorMan"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoorMan"
 
 
 PoorManLoggingView::PoorManLoggingView(BRect rect, const char *name)
diff --git a/src/apps/poorman/PoorManPreferencesWindow.cpp b/src/apps/poorman/PoorManPreferencesWindow.cpp
index 1ceb036aaf..21a7137ee3 100644
--- a/src/apps/poorman/PoorManPreferencesWindow.cpp
+++ b/src/apps/poorman/PoorManPreferencesWindow.cpp
@@ -19,8 +19,8 @@
 #include "PoorManServer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoorMan"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoorMan"
 
 
 PoorManPreferencesWindow::PoorManPreferencesWindow(BRect frame, char * name)
diff --git a/src/apps/poorman/PoorManWindow.cpp b/src/apps/poorman/PoorManWindow.cpp
index 955c887a9d..08eb8b83e8 100644
--- a/src/apps/poorman/PoorManWindow.cpp
+++ b/src/apps/poorman/PoorManWindow.cpp
@@ -36,8 +36,8 @@
 #include "constants.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoorMan"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoorMan"
 #define DATE_FORMAT B_SHORT_DATE_FORMAT
 #define TIME_FORMAT B_MEDIUM_TIME_FORMAT
 
diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp
index 19379bbbc8..2e97faa229 100644
--- a/src/apps/poorman/constants.cpp
+++ b/src/apps/poorman/constants.cpp
@@ -5,8 +5,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoorMan"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoorMan"
 
 
 // ------------------------------------------------------
diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp b/src/apps/powerstatus/ExtendedInfoWindow.cpp
index b51cd30cb2..da80bd90ba 100644
--- a/src/apps/powerstatus/ExtendedInfoWindow.cpp
+++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp
@@ -15,8 +15,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PowerStatus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PowerStatus"
 
 
 const int kLineSpacing = 5;
diff --git a/src/apps/powerstatus/PowerStatus.cpp b/src/apps/powerstatus/PowerStatus.cpp
index a020164f2f..ebaefb73da 100644
--- a/src/apps/powerstatus/PowerStatus.cpp
+++ b/src/apps/powerstatus/PowerStatus.cpp
@@ -21,8 +21,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PowerStatus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PowerStatus"
 
 
 class PowerStatus : public BApplication {
diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp
index 888a30318e..f0362e8b3b 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -37,8 +37,8 @@
 #include "PowerStatus.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PowerStatus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PowerStatus"
 
 
 extern "C" _EXPORT BView *instantiate_deskbar_item(void);
diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
index 2a74d94d78..4a8cdbae26 100644
--- a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
+++ b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
@@ -29,8 +29,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 
 KernelMemoryBarMenuItem::KernelMemoryBarMenuItem(system_info& systemInfo)
diff --git a/src/apps/processcontroller/NoiseBarMenuItem.cpp b/src/apps/processcontroller/NoiseBarMenuItem.cpp
index 89993aef2d..0e0b890bc4 100644
--- a/src/apps/processcontroller/NoiseBarMenuItem.cpp
+++ b/src/apps/processcontroller/NoiseBarMenuItem.cpp
@@ -23,8 +23,8 @@
 #include "Colors.h"
 #include "ProcessController.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 NoiseBarMenuItem::NoiseBarMenuItem()
 	: BMenuItem(B_TRANSLATE("Gone teams"B_UTF8_ELLIPSIS), NULL)
diff --git a/src/apps/processcontroller/PCWorld.cpp b/src/apps/processcontroller/PCWorld.cpp
index 836867f47b..d4b8c7dad8 100644
--- a/src/apps/processcontroller/PCWorld.cpp
+++ b/src/apps/processcontroller/PCWorld.cpp
@@ -39,8 +39,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 
 class PCApplication : public BApplication {
diff --git a/src/apps/processcontroller/Preferences.cpp b/src/apps/processcontroller/Preferences.cpp
index e7fd7b9da5..8b4ca9b34d 100644
--- a/src/apps/processcontroller/Preferences.cpp
+++ b/src/apps/processcontroller/Preferences.cpp
@@ -34,8 +34,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 Preferences::Preferences(const char* name, const char* signature, bool doSave)
 	: BMessage('Pref'), BLocker("Preferences", true),
diff --git a/src/apps/processcontroller/PriorityMenu.cpp b/src/apps/processcontroller/PriorityMenu.cpp
index 26172295bd..e50bb30d62 100644
--- a/src/apps/processcontroller/PriorityMenu.cpp
+++ b/src/apps/processcontroller/PriorityMenu.cpp
@@ -27,8 +27,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 PriorityMenu::PriorityMenu(thread_id thread, int32 priority)
 	: BMenu(B_EMPTY_STRING),
diff --git a/src/apps/processcontroller/ProcessController.cpp b/src/apps/processcontroller/ProcessController.cpp
index 59de2bf492..d70c7361a0 100644
--- a/src/apps/processcontroller/ProcessController.cpp
+++ b/src/apps/processcontroller/ProcessController.cpp
@@ -58,8 +58,8 @@
 #include "Utilities.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProcessController"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProcessController"
 
 
 const char* kDeskbarItemName = "ProcessController";
diff --git a/src/apps/pulse/CPUButton.cpp b/src/apps/pulse/CPUButton.cpp
index 41da655313..e14255a353 100644
--- a/src/apps/pulse/CPUButton.cpp
+++ b/src/apps/pulse/CPUButton.cpp
@@ -26,8 +26,8 @@
 #include "PulseView.h"
 #include "Common.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CPUButton"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CPUButton"
 
 
 CPUButton::CPUButton(BRect rect, const char *name, const char *label, BMessage *message)
diff --git a/src/apps/pulse/ConfigView.cpp b/src/apps/pulse/ConfigView.cpp
index 34440b5695..6fd981add7 100644
--- a/src/apps/pulse/ConfigView.cpp
+++ b/src/apps/pulse/ConfigView.cpp
@@ -24,8 +24,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigView"
 
 
 RTColorControl::RTColorControl(BPoint point, BMessage *message)
diff --git a/src/apps/pulse/DeskbarPulseView.cpp b/src/apps/pulse/DeskbarPulseView.cpp
index b7575d8648..802f7bb757 100644
--- a/src/apps/pulse/DeskbarPulseView.cpp
+++ b/src/apps/pulse/DeskbarPulseView.cpp
@@ -25,8 +25,8 @@
 #include "Prefs.h"
 #include "PulseApp.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeskbarPulseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeskbarPulseView"
 
 
 DeskbarPulseView::DeskbarPulseView(BRect rect) : MiniPulseView(rect, "DeskbarPulseView") {
diff --git a/src/apps/pulse/MiniPulseView.cpp b/src/apps/pulse/MiniPulseView.cpp
index 5cf2fa8cc4..e36089869c 100644
--- a/src/apps/pulse/MiniPulseView.cpp
+++ b/src/apps/pulse/MiniPulseView.cpp
@@ -13,8 +13,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MiniPulseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MiniPulseView"
 
 
 MiniPulseView::MiniPulseView(BRect rect, const char *name, Prefs *prefs) : 
diff --git a/src/apps/pulse/NormalPulseView.cpp b/src/apps/pulse/NormalPulseView.cpp
index d092077193..632b6bfa5c 100644
--- a/src/apps/pulse/NormalPulseView.cpp
+++ b/src/apps/pulse/NormalPulseView.cpp
@@ -24,8 +24,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NormalPulseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NormalPulseView"
 
 
 float
diff --git a/src/apps/pulse/PrefsWindow.cpp b/src/apps/pulse/PrefsWindow.cpp
index 0d5bcac52d..85d7424af0 100644
--- a/src/apps/pulse/PrefsWindow.cpp
+++ b/src/apps/pulse/PrefsWindow.cpp
@@ -22,8 +22,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrefsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrefsWindow"
 
 
 PrefsWindow::PrefsWindow(BRect frame, const char *name, 
diff --git a/src/apps/pulse/PulseApp.cpp b/src/apps/pulse/PulseApp.cpp
index 4d695006c0..9006f2fbb3 100644
--- a/src/apps/pulse/PulseApp.cpp
+++ b/src/apps/pulse/PulseApp.cpp
@@ -30,8 +30,8 @@
 #include "PulseWindow.h"
 #include "DeskbarPulseView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PulseApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PulseApp"
 
 
 PulseApp::PulseApp(int argc, char **argv)
diff --git a/src/apps/pulse/PulseView.cpp b/src/apps/pulse/PulseView.cpp
index 53b8677fac..d14037a1c6 100644
--- a/src/apps/pulse/PulseView.cpp
+++ b/src/apps/pulse/PulseView.cpp
@@ -22,8 +22,8 @@
 #include "Common.h"
 #include "PulseApp.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PulseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PulseView"
 
 
 PulseView::PulseView(BRect rect, const char *name) :
diff --git a/src/apps/pulse/PulseWindow.cpp b/src/apps/pulse/PulseWindow.cpp
index 80e14622c0..10e71b6e26 100644
--- a/src/apps/pulse/PulseWindow.cpp
+++ b/src/apps/pulse/PulseWindow.cpp
@@ -23,8 +23,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PulseWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PulseWindow"
 
 
 PulseWindow::PulseWindow(BRect rect)
diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp
index 80ffcdb18a..25dbfbc5a1 100644
--- a/src/apps/readonlybootprompt/BootPromptWindow.cpp
+++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp
@@ -48,8 +48,8 @@ enum {
 };
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "BootPromptWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "BootPromptWindow"
 
 
 namespace BPrivate {
diff --git a/src/apps/screenshot/Screenshot.cpp b/src/apps/screenshot/Screenshot.cpp
index cd2ce77e5f..071a056f6c 100644
--- a/src/apps/screenshot/Screenshot.cpp
+++ b/src/apps/screenshot/Screenshot.cpp
@@ -30,8 +30,8 @@
 #include "Utility.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screenshot"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screenshot"
 
 
 Screenshot::Screenshot()
diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp
index 2c66d0bee5..eea254ffdd 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -45,8 +45,8 @@
 #include "Utility.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ScreenshotWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ScreenshotWindow"
 
 
 enum {
diff --git a/src/apps/screenshot/Utility.cpp b/src/apps/screenshot/Utility.cpp
index d4f0f53672..e38639f0ab 100644
--- a/src/apps/screenshot/Utility.cpp
+++ b/src/apps/screenshot/Utility.cpp
@@ -32,8 +32,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screenshot"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screenshot"
 
 
 const char* Utility::sDefaultFileNameBase =
diff --git a/src/apps/showimage/PrintOptionsWindow.cpp b/src/apps/showimage/PrintOptionsWindow.cpp
index 7516f8a1cb..fca276f913 100644
--- a/src/apps/showimage/PrintOptionsWindow.cpp
+++ b/src/apps/showimage/PrintOptionsWindow.cpp
@@ -24,8 +24,8 @@
 #include "ShowImageConstants.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintOptionsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintOptionsWindow"
 
 
 PrintOptions::PrintOptions()
diff --git a/src/apps/showimage/ProgressWindow.cpp b/src/apps/showimage/ProgressWindow.cpp
index a49f711cfc..08221e5d91 100644
--- a/src/apps/showimage/ProgressWindow.cpp
+++ b/src/apps/showimage/ProgressWindow.cpp
@@ -21,8 +21,8 @@
 
 static const uint32 kMsgShow = 'show';
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProgressWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProgressWindow"
 
 
 ProgressWindow::ProgressWindow()
diff --git a/src/apps/showimage/ShowImageView.cpp b/src/apps/showimage/ShowImageView.cpp
index f959060df2..4551cf1f42 100644
--- a/src/apps/showimage/ShowImageView.cpp
+++ b/src/apps/showimage/ShowImageView.cpp
@@ -915,8 +915,8 @@ ShowImageView::_OutputFormatForType(BBitmap* bitmap, const char* type,
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SaveToFile"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SaveToFile"
 
 
 void
diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp
index c2ff932460..ac52492589 100644
--- a/src/apps/showimage/ShowImageWindow.cpp
+++ b/src/apps/showimage/ShowImageWindow.cpp
@@ -122,8 +122,8 @@ bs_printf(BString* string, const char* format, ...)
 //	#pragma mark -- ShowImageWindow
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Menus"
 
 
 ShowImageWindow::ShowImageWindow(BRect frame, const entry_ref& ref,
@@ -262,7 +262,7 @@ ShowImageWindow::ShowImageWindow(BRect frame, const entry_ref& ref,
 	}
 
 	// add View menu here so it can access ShowImageView methods
-	BMenu* menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("View", "Menus"));
+	BMenu* menu = new BMenu(B_TRANSLATE_CONTEXT("View", "Menus"));
 	_BuildViewMenu(menu, false);
 	fBar->AddItem(menu);
 
@@ -1102,10 +1102,10 @@ ShowImageWindow::_LoadError(const entry_ref& ref)
 {
 	// TODO: give a better error message!
 	BAlert* alert = new BAlert(B_TRANSLATE_SYSTEM_NAME("ShowImage"),
-		B_TRANSLATE_WITH_CONTEXT("Could not load image! Either the "
+		B_TRANSLATE_CONTEXT("Could not load image! Either the "
 			"file or an image translator for it does not exist.",
 			"LoadAlerts"),
-		B_TRANSLATE_WITH_CONTEXT("OK", "Alerts"), NULL, NULL,
+		B_TRANSLATE_CONTEXT("OK", "Alerts"), NULL, NULL,
 		B_WIDTH_AS_USUAL, B_INFO_ALERT);
 	alert->Go();
 }
@@ -1186,8 +1186,8 @@ ShowImageWindow::_SaveToFile(BMessage* message)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ClosePrompt"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ClosePrompt"
 
 
 bool
diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp
index f01381ca38..f5c6e7ceaf 100644
--- a/src/apps/soundrecorder/RecorderWindow.cpp
+++ b/src/apps/soundrecorder/RecorderWindow.cpp
@@ -56,8 +56,8 @@
 #define CONNECT FPRINTF
 #define WINDOW FPRINTF
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RecorderWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RecorderWindow"
 
 
 // default window positioning
diff --git a/src/apps/soundrecorder/SoundListView.cpp b/src/apps/soundrecorder/SoundListView.cpp
index 2410d4d64c..bd3bcab293 100644
--- a/src/apps/soundrecorder/SoundListView.cpp
+++ b/src/apps/soundrecorder/SoundListView.cpp
@@ -12,8 +12,8 @@
 #include "SoundListView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SoundListView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SoundListView"
 
 
 SoundListView::SoundListView(
diff --git a/src/apps/stylededit/FindWindow.cpp b/src/apps/stylededit/FindWindow.cpp
index f087a324b0..2f4eb61fd7 100644
--- a/src/apps/stylededit/FindWindow.cpp
+++ b/src/apps/stylededit/FindWindow.cpp
@@ -22,8 +22,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FindandReplaceWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FindandReplaceWindow"
 
 FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
 	bool caseState, bool wrapState, bool backState)
diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp
index 737a3a4226..b35e28f046 100644
--- a/src/apps/stylededit/ReplaceWindow.cpp
+++ b/src/apps/stylededit/ReplaceWindow.cpp
@@ -25,8 +25,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FindandReplaceWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FindandReplaceWindow"
 
 ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler,
 	BString* searchString, 	BString *replaceString,
diff --git a/src/apps/stylededit/StyledEditApp.cpp b/src/apps/stylededit/StyledEditApp.cpp
index 8aae8dc98b..ff66954e17 100644
--- a/src/apps/stylededit/StyledEditApp.cpp
+++ b/src/apps/stylededit/StyledEditApp.cpp
@@ -80,8 +80,8 @@ namespace
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Open_and_SaveAsPanel"
 
 
 StyledEditApp::StyledEditApp()
diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp
index 6cd9270001..3ac854199f 100644
--- a/src/apps/stylededit/StyledEditWindow.cpp
+++ b/src/apps/stylededit/StyledEditWindow.cpp
@@ -52,8 +52,8 @@ const float kLineViewWidth = 30.0;
 const char* kInfoAttributeName = "StyledEdit-info";
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "StyledEditWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "StyledEditWindow"
 
 
 // This is a temporary solution for building BString with printf like format.
@@ -114,8 +114,8 @@ StyledEditWindow::Quit()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "QuitAlert"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "QuitAlert"
 
 
 bool
@@ -649,8 +649,8 @@ StyledEditWindow::MenusBeginning()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SaveAlert"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SaveAlert"
 
 
 status_t
@@ -730,8 +730,8 @@ StyledEditWindow::Save(BMessage* message)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Open_and_SaveAsPanel"
 
 
 status_t
@@ -964,8 +964,8 @@ StyledEditWindow::IsDocumentEntryRef(const entry_ref* ref)
 // #pragma mark - private methods
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Menus"
 
 
 void
@@ -1280,8 +1280,8 @@ StyledEditWindow::_SaveAttrs()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LoadAlert"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LoadAlert"
 
 
 status_t
@@ -1345,8 +1345,8 @@ StyledEditWindow::_LoadFile(entry_ref* ref)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RevertToSavedAlert"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RevertToSavedAlert"
 
 
 void
@@ -1386,8 +1386,8 @@ StyledEditWindow::_RevertToSaved()
 	if (_LoadFile(&ref) != B_OK)
 		return;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Menus"
 
 	// clear undo modes
 	fUndoItem->SetLabel(B_TRANSLATE("Can't undo"));
@@ -1597,8 +1597,8 @@ StyledEditWindow::_SetFontStyle(const char* fontFamily, const char* fontStyle)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Statistics"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Statistics"
 
 
 int32
@@ -1630,8 +1630,8 @@ StyledEditWindow::_ShowStatistics()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menus"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Menus"
 
 
 void
diff --git a/src/apps/sudoku/ProgressWindow.cpp b/src/apps/sudoku/ProgressWindow.cpp
index 60ec486459..c8d7251190 100644
--- a/src/apps/sudoku/ProgressWindow.cpp
+++ b/src/apps/sudoku/ProgressWindow.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProgressWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProgressWindow"
 
 
 static const uint32 kMsgShow = 'show';
diff --git a/src/apps/sudoku/Sudoku.cpp b/src/apps/sudoku/Sudoku.cpp
index 95c6881d42..475c8814b8 100644
--- a/src/apps/sudoku/Sudoku.cpp
+++ b/src/apps/sudoku/Sudoku.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Sudoku"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Sudoku"
 
 
 const char* kSignature = "application/x-vnd.Haiku-Sudoku";
diff --git a/src/apps/sudoku/SudokuGenerator.cpp b/src/apps/sudoku/SudokuGenerator.cpp
index 13f1a3a374..32d06a9c7a 100644
--- a/src/apps/sudoku/SudokuGenerator.cpp
+++ b/src/apps/sudoku/SudokuGenerator.cpp
@@ -17,8 +17,8 @@
 #include "SudokuSolver.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SudokuGenerator"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SudokuGenerator"
 
 
 SudokuGenerator::SudokuGenerator()
diff --git a/src/apps/sudoku/SudokuWindow.cpp b/src/apps/sudoku/SudokuWindow.cpp
index d0672647fa..9a7f9a713f 100644
--- a/src/apps/sudoku/SudokuWindow.cpp
+++ b/src/apps/sudoku/SudokuWindow.cpp
@@ -30,8 +30,8 @@
 #include "SudokuView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SudokuWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SudokuWindow"
 
 
 const uint32 kMsgOpenFilePanel = 'opfp';
diff --git a/src/apps/switcher/LaunchButton.cpp b/src/apps/switcher/LaunchButton.cpp
index a1a0ec29cf..11905a5696 100644
--- a/src/apps/switcher/LaunchButton.cpp
+++ b/src/apps/switcher/LaunchButton.cpp
@@ -25,8 +25,8 @@
 
 #define DEFAULT_ICON_SIZE 64
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LaunchBox"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LaunchBox"
 
 
 static const float kDragStartDist = 10.0;
diff --git a/src/apps/switcher/Switcher.cpp b/src/apps/switcher/Switcher.cpp
index 9e047a3555..929c3023f7 100644
--- a/src/apps/switcher/Switcher.cpp
+++ b/src/apps/switcher/Switcher.cpp
@@ -15,8 +15,8 @@
 #include "PanelWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Switcher"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Switcher"
 
 
 const char* kSignature = "application/x-vnd.Haiku-Switcher";
diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp
index 75b87848f7..bbf1c78708 100644
--- a/src/apps/terminal/AppearPrefView.cpp
+++ b/src/apps/terminal/AppearPrefView.cpp
@@ -29,8 +29,8 @@
 #include "TermConst.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal AppearancePrefView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal AppearancePrefView"
 
 
 static bool
diff --git a/src/apps/terminal/Arguments.cpp b/src/apps/terminal/Arguments.cpp
index cceb739850..99305ee5b4 100644
--- a/src/apps/terminal/Arguments.cpp
+++ b/src/apps/terminal/Arguments.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal arguments parsing"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal arguments parsing"
 
 
 Arguments::Arguments(int defaultArgsNum, const char* const* defaultArgs)
diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp
index 877e0ef9ca..a10fff6919 100644
--- a/src/apps/terminal/Colors.cpp
+++ b/src/apps/terminal/Colors.cpp
@@ -8,8 +8,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal colors schema"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal colors schema"
 
 
 const rgb_color kBlack= { 0, 0, 0, 255 };
diff --git a/src/apps/terminal/FindWindow.cpp b/src/apps/terminal/FindWindow.cpp
index 05fbf7dac3..181ddf2f69 100644
--- a/src/apps/terminal/FindWindow.cpp
+++ b/src/apps/terminal/FindWindow.cpp
@@ -26,8 +26,8 @@ const uint32 MSG_FIND_HIDE = 'Fhid';
 const uint32 TOGGLE_FIND_CONTROL = 'MTFG';
 const BRect kWindowFrame(10, 30, 250, 200);
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal FindWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal FindWindow"
 
 FindWindow::FindWindow(BMessenger messenger, const BString& str,
 		bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
diff --git a/src/apps/terminal/PrefHandler.cpp b/src/apps/terminal/PrefHandler.cpp
index ef9059b22b..694ea1c907 100644
--- a/src/apps/terminal/PrefHandler.cpp
+++ b/src/apps/terminal/PrefHandler.cpp
@@ -217,8 +217,8 @@ PrefHandler::getFloat(const char *key)
 	return atof(value);
 }
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal getString"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal getString"
 
 const char*
 PrefHandler::getString(const char *key)
@@ -243,8 +243,8 @@ PrefHandler::getBool(const char *key)
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal getRGB"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal getRGB"
 
 /** Returns RGB data from given key. */
 
diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp
index 459e335fd5..ea1785e8de 100644
--- a/src/apps/terminal/PrefWindow.cpp
+++ b/src/apps/terminal/PrefWindow.cpp
@@ -23,8 +23,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal PrefWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal PrefWindow"
 
 PrefWindow::PrefWindow(const BMessenger& messenger)
 	:
diff --git a/src/apps/terminal/SetTitleDialog.cpp b/src/apps/terminal/SetTitleDialog.cpp
index 8b71c28720..72deef82c0 100644
--- a/src/apps/terminal/SetTitleDialog.cpp
+++ b/src/apps/terminal/SetTitleDialog.cpp
@@ -17,8 +17,8 @@ static const uint32 kMessageDefault			= 'dflt';
 static const uint32 kMessageTitleChanged	= 'chng';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal SetTitleWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal SetTitleWindow"
 
 
 // #pragma mark - SetTitleDialog
diff --git a/src/apps/terminal/Shell.cpp b/src/apps/terminal/Shell.cpp
index 2c602a94b9..12c3c92689 100644
--- a/src/apps/terminal/Shell.cpp
+++ b/src/apps/terminal/Shell.cpp
@@ -379,8 +379,8 @@ initialize_termios(struct termios &tio)
 	tio.c_cc[VSUSP]  = CSUSP;		/* '^Z' */
 }
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal Shell"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal Shell"
 
 status_t
 Shell::_Spawn(int row, int col, const ShellParameters& parameters)
diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index c72fa6aaf1..20436f2215 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -47,8 +47,8 @@ main()
 	return 0;
 }
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal TermApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal TermApp"
 
 TermApp::TermApp()
 	: BApplication(TERM_SIGNATURE),
diff --git a/src/apps/terminal/TermConst.cpp b/src/apps/terminal/TermConst.cpp
index 2fcebd8f82..f04adb6d63 100644
--- a/src/apps/terminal/TermConst.cpp
+++ b/src/apps/terminal/TermConst.cpp
@@ -9,8 +9,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal ToolTips"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal ToolTips"
 
 
 const char* const kTooTipSetTabTitlePlaceholders = B_TRANSLATE(
diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index 1012160007..aa3c441083 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -340,8 +340,8 @@ enum {
 	SELECT_LINES
 };
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal TermView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal TermView"
 
 static property_info sPropList[] = {
 	{ "encoding",
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index 8c67d4fbed..be789f1fa3 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -74,8 +74,8 @@ static const uint32 kUpdateSwitchTerminalsMenuItem = 'Ustm';
 
 using namespace BPrivate ; // BCharacterSet stuff
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Terminal TermWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Terminal TermWindow"
 
 
 // #pragma mark - TermViewContainerView
diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp
index 246173335d..928bd69501 100644
--- a/src/apps/text_search/GrepWindow.cpp
+++ b/src/apps/text_search/GrepWindow.cpp
@@ -46,8 +46,8 @@
 #include "InitialIterator.h"
 #include "Translation.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "GrepWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "GrepWindow"
 
 
 using std::nothrow;
diff --git a/src/apps/text_search/Grepper.cpp b/src/apps/text_search/Grepper.cpp
index e844c029bc..053dcbb47c 100644
--- a/src/apps/text_search/Grepper.cpp
+++ b/src/apps/text_search/Grepper.cpp
@@ -39,8 +39,8 @@
 #include "FileIterator.h"
 #include "Model.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Grepper"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Grepper"
 
 
 using std::nothrow;
diff --git a/src/apps/tv/MainApp.cpp b/src/apps/tv/MainApp.cpp
index 80b6188337..e60a85bb47 100644
--- a/src/apps/tv/MainApp.cpp
+++ b/src/apps/tv/MainApp.cpp
@@ -33,8 +33,8 @@
 #include "config.h"
 #include "DeviceRoster.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MainApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainApp"
 
 
 MainApp *gMainApp;
diff --git a/src/apps/tv/MainWin.cpp b/src/apps/tv/MainWin.cpp
index ebe0b9d986..63db99e696 100644
--- a/src/apps/tv/MainWin.cpp
+++ b/src/apps/tv/MainWin.cpp
@@ -43,8 +43,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MainWin"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MainWin"
 
 B_TRANSLATE_MARK_VOID("TV");
 B_TRANSLATE_MARK_VOID("unknown");
diff --git a/src/apps/webwatch/WatchView.cpp b/src/apps/webwatch/WatchView.cpp
index 02a2c0c2b0..99d889cef6 100644
--- a/src/apps/webwatch/WatchView.cpp
+++ b/src/apps/webwatch/WatchView.cpp
@@ -30,8 +30,8 @@
 #include "WatchApp.h"
 #include "WatchView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WatchView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WatchView"
 
 
 const rgb_color COLOR_FOREGROUND = { 0, 0, 0 };
diff --git a/src/apps/workspaces/Workspaces.cpp b/src/apps/workspaces/Workspaces.cpp
index e7b99f9dd9..9ca9071754 100644
--- a/src/apps/workspaces/Workspaces.cpp
+++ b/src/apps/workspaces/Workspaces.cpp
@@ -37,8 +37,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Workspaces"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Workspaces"
 
 
 static const char* kDeskbarItemName = "workspaces";
diff --git a/src/bin/desklink/DeskButton.cpp b/src/bin/desklink/DeskButton.cpp
index 5076f53553..724481efc5 100644
--- a/src/bin/desklink/DeskButton.cpp
+++ b/src/bin/desklink/DeskButton.cpp
@@ -27,8 +27,8 @@
 #define DO_ACTION	'doac'
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeskButton"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeskButton"
 
 
 extern const char *kAppSignature;
diff --git a/src/bin/desklink/MediaReplicant.cpp b/src/bin/desklink/MediaReplicant.cpp
index b37c9b8233..f9a379accc 100644
--- a/src/bin/desklink/MediaReplicant.cpp
+++ b/src/bin/desklink/MediaReplicant.cpp
@@ -40,8 +40,8 @@
 #include "VolumeWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MediaReplicant"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MediaReplicant"
 
 
 static const uint32 kMsgOpenMediaSettings = 'mese';
diff --git a/src/bin/desklink/VolumeControl.cpp b/src/bin/desklink/VolumeControl.cpp
index 41cd320ccd..8e780702f2 100644
--- a/src/bin/desklink/VolumeControl.cpp
+++ b/src/bin/desklink/VolumeControl.cpp
@@ -31,8 +31,8 @@
 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "VolumeControl"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "VolumeControl"
 
 
 static const char* kMediaServerSignature = "application/x-vnd.Be.media-server";
diff --git a/src/bin/dstcheck.cpp b/src/bin/dstcheck.cpp
index 2af6923fe8..135b84b030 100644
--- a/src/bin/dstcheck.cpp
+++ b/src/bin/dstcheck.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "dstcheck"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "dstcheck"
 
 
 const uint32 TIMEDALERT_UPDATE = 'taup';
diff --git a/src/bin/filepanel.cpp b/src/bin/filepanel.cpp
index c6684aeaf5..bdffabd010 100644
--- a/src/bin/filepanel.cpp
+++ b/src/bin/filepanel.cpp
@@ -27,8 +27,8 @@
 
 #define APP_SIG "application/x-vnd.mmu_man.filepanel"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FilePanelApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FilePanelApp"
 
 
 volatile int return_code = 0;
diff --git a/src/bin/screen_blanker/PasswordWindow.cpp b/src/bin/screen_blanker/PasswordWindow.cpp
index ab0e3f55f1..156a9f758e 100644
--- a/src/bin/screen_blanker/PasswordWindow.cpp
+++ b/src/bin/screen_blanker/PasswordWindow.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screensaver password dialog"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screensaver password dialog"
 
 
 PasswordWindow::PasswordWindow()
diff --git a/src/kits/bluetooth/DeviceClass.cpp b/src/kits/bluetooth/DeviceClass.cpp
index 78a4878057..33ef99e86f 100644
--- a/src/kits/bluetooth/DeviceClass.cpp
+++ b/src/kits/bluetooth/DeviceClass.cpp
@@ -9,8 +9,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeviceClass"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeviceClass"
 
 
 namespace Bluetooth {
diff --git a/src/kits/bluetooth/RemoteDevice.cpp b/src/kits/bluetooth/RemoteDevice.cpp
index 3e063a9531..d80eb4f1f9 100644
--- a/src/kits/bluetooth/RemoteDevice.cpp
+++ b/src/kits/bluetooth/RemoteDevice.cpp
@@ -23,8 +23,8 @@
 
 #include "KitSupport.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "RemoteDevice"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "RemoteDevice"
 
 
 namespace Bluetooth {
diff --git a/src/kits/interface/ColorControl.cpp b/src/kits/interface/ColorControl.cpp
index 919c5bedf4..4187652d58 100644
--- a/src/kits/interface/ColorControl.cpp
+++ b/src/kits/interface/ColorControl.cpp
@@ -31,8 +31,8 @@ using BPrivate::gSystemCatalog;
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ColorControl"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ColorControl"
 
 static const uint32 kMsgColorEntered = 'ccol';
 static const uint32 kMinCellSize = 6;
diff --git a/src/kits/interface/Dragger.cpp b/src/kits/interface/Dragger.cpp
index fa5020230a..9b37ca32dd 100644
--- a/src/kits/interface/Dragger.cpp
+++ b/src/kits/interface/Dragger.cpp
@@ -38,8 +38,8 @@
 
 using BPrivate::gSystemCatalog;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Dragger"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Dragger"
 
 #undef B_TRANSLATE
 #define B_TRANSLATE(str) \
diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index d5760decca..c8692063d9 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -47,8 +47,8 @@
 
 using BPrivate::gSystemCatalog;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Menu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Menu"
 
 #undef B_TRANSLATE
 #define B_TRANSLATE(str) \
diff --git a/src/kits/interface/PrintJob.cpp b/src/kits/interface/PrintJob.cpp
index 59c9543096..d21f27fa09 100644
--- a/src/kits/interface/PrintJob.cpp
+++ b/src/kits/interface/PrintJob.cpp
@@ -37,8 +37,8 @@
 
 using BPrivate::gSystemCatalog;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintJob"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintJob"
 
 #undef B_TRANSLATE
 #define B_TRANSLATE(str) \
diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 9d14a84a04..16934da6d9 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -60,8 +60,8 @@ using namespace std;
 using BPrivate::gSystemCatalog;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TextView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TextView"
 
 
 #define TRANSLATE(str) \
diff --git a/src/kits/interface/ZombieReplicantView.cpp b/src/kits/interface/ZombieReplicantView.cpp
index 4269009f8c..400a2db953 100644
--- a/src/kits/interface/ZombieReplicantView.cpp
+++ b/src/kits/interface/ZombieReplicantView.cpp
@@ -21,8 +21,8 @@
 
 using BPrivate::gSystemCatalog;
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ZombieReplicantView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ZombieReplicantView"
 
 #undef B_TRANSLATE
 #define B_TRANSLATE(str) \
diff --git a/src/kits/mail/FileConfigView.cpp b/src/kits/mail/FileConfigView.cpp
index dad1be2d7b..5e73c8d1e4 100644
--- a/src/kits/mail/FileConfigView.cpp
+++ b/src/kits/mail/FileConfigView.cpp
@@ -20,8 +20,8 @@ class _EXPORT BFileControl;
 class _EXPORT BMailFileConfigView;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MailKit"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MailKit"
 
 
 const uint32 kMsgSelectButton = 'fsel';
diff --git a/src/kits/mail/ProtocolConfigView.cpp b/src/kits/mail/ProtocolConfigView.cpp
index b1c6004489..053c93b23c 100644
--- a/src/kits/mail/ProtocolConfigView.cpp
+++ b/src/kits/mail/ProtocolConfigView.cpp
@@ -25,8 +25,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ProtocolConfigView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ProtocolConfigView"
 
 
 const char* kPartialDownloadLimit = "partial_download_limit";
diff --git a/src/kits/shared/AboutMenuItem.cpp b/src/kits/shared/AboutMenuItem.cpp
index bfda1b9550..650a8484a0 100644
--- a/src/kits/shared/AboutMenuItem.cpp
+++ b/src/kits/shared/AboutMenuItem.cpp
@@ -17,8 +17,8 @@
 using BPrivate::gSystemCatalog;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AboutMenuItem"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AboutMenuItem"
 
 
 BAboutMenuItem::BAboutMenuItem()
diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
index ed0c53f16d..c5dd25501e 100644
--- a/src/kits/shared/AboutWindow.cpp
+++ b/src/kits/shared/AboutWindow.cpp
@@ -20,8 +20,8 @@
 using BPrivate::gSystemCatalog;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AboutWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AboutWindow"
 
 
 BAboutWindow::BAboutWindow(const char *appName, int32 firstCopyrightYear,
diff --git a/src/kits/shared/StringForSize.cpp b/src/kits/shared/StringForSize.cpp
index 40a89a7910..f7f5d26881 100644
--- a/src/kits/shared/StringForSize.cpp
+++ b/src/kits/shared/StringForSize.cpp
@@ -12,8 +12,8 @@
 using BPrivate::gSystemCatalog;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "StringForSize"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "StringForSize"
 
 
 namespace BPrivate {
@@ -26,33 +26,33 @@ string_for_size(double size, char* string, size_t stringSize)
 	if (kib < 1.0) {
 		const char* trKey = B_TRANSLATE_MARK("%d bytes");
 		snprintf(string, stringSize, gSystemCatalog.GetString(trKey,
-			B_TRANSLATE_CONTEXT), (int)size);
+			B_TRANSLATION_CONTEXT), (int)size);
 		return string;
 	}
 	double mib = kib / 1024.0;
 	if (mib < 1.0) {
 		const char* trKey = B_TRANSLATE_MARK("%3.2f KiB");
 		snprintf(string, stringSize, gSystemCatalog.GetString(trKey,
-			B_TRANSLATE_CONTEXT), kib);
+			B_TRANSLATION_CONTEXT), kib);
 		return string;
 	}
 	double gib = mib / 1024.0;
 	if (gib < 1.0) {
 		const char* trKey = B_TRANSLATE_MARK("%3.2f MiB");
 		snprintf(string, stringSize, gSystemCatalog.GetString(trKey,
-			B_TRANSLATE_CONTEXT), mib);
+			B_TRANSLATION_CONTEXT), mib);
 		return string;
 	}
 	double tib = gib / 1024.0;
 	if (tib < 1.0) {
 		const char* trKey = B_TRANSLATE_MARK("%3.2f GiB");
 		snprintf(string, stringSize, gSystemCatalog.GetString(trKey,
-			B_TRANSLATE_CONTEXT), gib);
+			B_TRANSLATION_CONTEXT), gib);
 		return string;
 	}
 	const char* trKey = B_TRANSLATE_MARK("%.2f TiB");
 	snprintf(string, stringSize, gSystemCatalog.GetString(trKey,
-		B_TRANSLATE_CONTEXT), tib);
+		B_TRANSLATION_CONTEXT), tib);
 	return string;
 }
 
diff --git a/src/kits/textencoding/character_sets.cpp b/src/kits/textencoding/character_sets.cpp
index d4352d0712..660973fc0d 100644
--- a/src/kits/textencoding/character_sets.cpp
+++ b/src/kits/textencoding/character_sets.cpp
@@ -5,8 +5,8 @@
 #include 
 #include "character_sets.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "textencodings"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "textencodings"
 
 namespace BPrivate {
 
diff --git a/src/kits/tracker/AutoMounterSettings.cpp b/src/kits/tracker/AutoMounterSettings.cpp
index 8321920bd6..795870fa44 100644
--- a/src/kits/tracker/AutoMounterSettings.cpp
+++ b/src/kits/tracker/AutoMounterSettings.cpp
@@ -56,8 +56,8 @@ const uint32 kAutomountSettingsChanged = 'achg';
 const uint32 kBootMountSettingsChanged = 'bchg';
 const uint32 kEjectWhenUnmountingChanged = 'ejct';
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AutoMounterSettings"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AutoMounterSettings"
 
 class AutomountSettingsPanel : public BBox {
 public:
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 1642c10af9..be5af6bcda 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -91,8 +91,8 @@ All rights reserved.
 #include "TemplatesMenu.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ContainerWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ContainerWindow"
 
 const uint32 kRedo = 'REDO';
 	// this is the same as B_REDO in Dano/Zeta/Haiku
diff --git a/src/kits/tracker/CountView.cpp b/src/kits/tracker/CountView.cpp
index 0f1ee9bf47..c633d5c30a 100644
--- a/src/kits/tracker/CountView.cpp
+++ b/src/kits/tracker/CountView.cpp
@@ -52,8 +52,8 @@ All rights reserved.
 const bigtime_t kBarberPoleDelay = 500000;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CountView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CountView"
 
 BCountView::BCountView(BRect bounds, BPoseView* view)
 	: BView(bounds, "CountVw", B_FOLLOW_LEFT + B_FOLLOW_BOTTOM,
diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index 0401a94dec..fa16d62c56 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -105,8 +105,8 @@ AddOneShortcut(const Model *model, const char *, uint32 shortcut, bool /*primary
 
 // #pragma mark -
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeskWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeskWindow"
 
 BDeskWindow::BDeskWindow(LockingList *windowList)
 	:
diff --git a/src/kits/tracker/DirMenu.cpp b/src/kits/tracker/DirMenu.cpp
index 52f2329f81..1d3a4d99da 100644
--- a/src/kits/tracker/DirMenu.cpp
+++ b/src/kits/tracker/DirMenu.cpp
@@ -54,8 +54,8 @@ All rights reserved.
 #include "Utilities.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DirMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DirMenu"
 
 
 BDirMenu::BDirMenu(BMenuBar *bar, BMessenger target, uint32 command,
diff --git a/src/kits/tracker/FSClipboard.cpp b/src/kits/tracker/FSClipboard.cpp
index 5857872b9b..4921922fdc 100644
--- a/src/kits/tracker/FSClipboard.cpp
+++ b/src/kits/tracker/FSClipboard.cpp
@@ -108,8 +108,8 @@ CompareModeAndRefName(const char *modeName, const char *refName)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FSClipBoard"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FSClipBoard"
 
 bool
 FSClipboardHasRefs()
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index f85df2dbc2..ac2c1580e7 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -102,8 +102,8 @@ enum ConflictCheckResult {
 
 namespace BPrivate {
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FSUtils"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FSUtils"
 
 static status_t FSDeleteFolder(BEntry *, CopyLoopControl *, bool updateStatus,
 	bool deleteTopDir = true, bool upateFileNameInStatus = false);
diff --git a/src/kits/tracker/FavoritesMenu.cpp b/src/kits/tracker/FavoritesMenu.cpp
index 7054814219..0e716622cf 100644
--- a/src/kits/tracker/FavoritesMenu.cpp
+++ b/src/kits/tracker/FavoritesMenu.cpp
@@ -57,8 +57,8 @@ All rights reserved.
 #include "Utilities.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FavoritesMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FavoritesMenu"
 
 FavoritesMenu::FavoritesMenu(const char *title, BMessage *openFolderMessage,
 	BMessage *openFileMessage, const BMessenger &target,
diff --git a/src/kits/tracker/FilePanelPriv.cpp b/src/kits/tracker/FilePanelPriv.cpp
index 9b360c76fb..684e154d9d 100644
--- a/src/kits/tracker/FilePanelPriv.cpp
+++ b/src/kits/tracker/FilePanelPriv.cpp
@@ -138,8 +138,8 @@ key_down_filter(BMessage *message, BHandler **handler, BMessageFilter *filter)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FilePanelPriv"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FilePanelPriv"
 
 TFilePanel::TFilePanel(file_panel_mode mode, BMessenger *target,
 		const BEntry *startDir, uint32 nodeFlavors, bool multipleSelection,
diff --git a/src/kits/tracker/FilePermissionsView.cpp b/src/kits/tracker/FilePermissionsView.cpp
index 4afa8df3cd..069ceecb8c 100644
--- a/src/kits/tracker/FilePermissionsView.cpp
+++ b/src/kits/tracker/FilePermissionsView.cpp
@@ -47,8 +47,8 @@ const uint32 kNewOwnerEntered = 'nwow';
 const uint32 kNewGroupEntered = 'nwgr';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FilePermissionsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FilePermissionsView"
 
 FilePermissionsView::FilePermissionsView(BRect rect, Model *model)
 	:	BView(rect, "FilePermissionsView", B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW),
diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index f2a1a12551..1f74cf32cd 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -76,8 +76,8 @@ All rights reserved.
 #include "Utilities.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FindPanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FindPanel"
 
 const char *kAllMimeTypes = "mime/ALLTYPES";
 
diff --git a/src/kits/tracker/InfoWindow.cpp b/src/kits/tracker/InfoWindow.cpp
index 7fd01a6a21..44db4c55df 100644
--- a/src/kits/tracker/InfoWindow.cpp
+++ b/src/kits/tracker/InfoWindow.cpp
@@ -76,8 +76,8 @@ All rights reserved.
 #include "WidgetAttributeText.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InfoWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InfoWindow"
 
 
 namespace BPrivate {
diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index 115381b977..392b8e4d08 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -85,8 +85,8 @@ bool CheckNodeIconHintPrivate(const BNode *, bool);
 }
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Model"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Model"
 
 Model::Model()
 	:
diff --git a/src/kits/tracker/MountMenu.cpp b/src/kits/tracker/MountMenu.cpp
index ea124ea20c..d0b32a71ac 100644
--- a/src/kits/tracker/MountMenu.cpp
+++ b/src/kits/tracker/MountMenu.cpp
@@ -156,8 +156,8 @@ AddMenuItemVisitor::Visit(BPartition *partition, int32 level)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MountMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MountMenu"
 
 MountMenu::MountMenu(const char *name)
 	: BMenu(name)
diff --git a/src/kits/tracker/NavMenu.cpp b/src/kits/tracker/NavMenu.cpp
index 1b57512eb6..abe86fff11 100644
--- a/src/kits/tracker/NavMenu.cpp
+++ b/src/kits/tracker/NavMenu.cpp
@@ -251,8 +251,8 @@ SpringLoadedFolderCacheDragData(const BMessage* incoming, BMessage* *message,
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NavMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NavMenu"
 
 BNavMenu::BNavMenu(const char* title, uint32 message, const BHandler* target,
 	BWindow* parentWindow, const BObjectList *list)
diff --git a/src/kits/tracker/OpenWithWindow.cpp b/src/kits/tracker/OpenWithWindow.cpp
index cda26cb805..cfefdc9e7a 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -73,8 +73,8 @@ const int32 kOpenAndMakeDefault = 'OpDf';
 const rgb_color kOpenWithDefaultColor = { 0xFF, 0xFF, 0xCC, 255};
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "OpenWithWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "OpenWithWindow"
 
 OpenWithContainerWindow::OpenWithContainerWindow(BMessage *entriesToOpen,
 		LockingList *windowList, window_look look, window_feel feel,
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 4dd85b59c8..d3acf338c7 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -101,8 +101,8 @@ All rights reserved.
 #include "WidthBuffer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PoseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PoseView"
 
 using std::min;
 using std::max;
diff --git a/src/kits/tracker/QueryContainerWindow.cpp b/src/kits/tracker/QueryContainerWindow.cpp
index 9a5d11dbff..5f5763a719 100644
--- a/src/kits/tracker/QueryContainerWindow.cpp
+++ b/src/kits/tracker/QueryContainerWindow.cpp
@@ -47,8 +47,8 @@ All rights reserved.
 #include "QueryPoseView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "QueryContainerWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "QueryContainerWindow"
 
 BQueryContainerWindow::BQueryContainerWindow(LockingList *windowList,
 	uint32 containerWindowFlags, window_look look,
diff --git a/src/kits/tracker/QueryPoseView.cpp b/src/kits/tracker/QueryPoseView.cpp
index 1e3c7c4967..80948de6a0 100644
--- a/src/kits/tracker/QueryPoseView.cpp
+++ b/src/kits/tracker/QueryPoseView.cpp
@@ -57,8 +57,8 @@ All rights reserved.
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "QueryPoseView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "QueryPoseView"
 
 using std::nothrow;
 
diff --git a/src/kits/tracker/SelectionWindow.cpp b/src/kits/tracker/SelectionWindow.cpp
index 23bd1daa6a..6743d65865 100644
--- a/src/kits/tracker/SelectionWindow.cpp
+++ b/src/kits/tracker/SelectionWindow.cpp
@@ -50,8 +50,8 @@ All rights reserved.
 const uint32 kSelectButtonPressed = 'sbpr';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SelectionWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SelectionWindow"
 
 
 SelectionWindow::SelectionWindow(BContainerWindow* window)
diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp
index ce2ba4d3ae..5249f67b6f 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -82,8 +82,8 @@ send_bool_notices(uint32 what, const char *name, bool value)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SettingsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsView"
 
 SettingsView::SettingsView(const char* name)
 	:
diff --git a/src/kits/tracker/SlowContextPopup.cpp b/src/kits/tracker/SlowContextPopup.cpp
index 5c9ec17b06..e81201dbaf 100644
--- a/src/kits/tracker/SlowContextPopup.cpp
+++ b/src/kits/tracker/SlowContextPopup.cpp
@@ -62,8 +62,8 @@ All rights reserved.
 #include "Tracker.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SlowContextPopup"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SlowContextPopup"
 
 BSlowContextMenu::BSlowContextMenu(const char *title)
 	:	BPopUpMenu(title, false, false),
diff --git a/src/kits/tracker/StatusWindow.cpp b/src/kits/tracker/StatusWindow.cpp
index ece34097a3..55e1cbd55e 100644
--- a/src/kits/tracker/StatusWindow.cpp
+++ b/src/kits/tracker/StatusWindow.cpp
@@ -186,8 +186,8 @@ public:
 // #pragma mark - BStatusWindow
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "StatusWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "StatusWindow"
 
 
 BStatusWindow::BStatusWindow()
diff --git a/src/kits/tracker/TemplatesMenu.cpp b/src/kits/tracker/TemplatesMenu.cpp
index 45d1acf525..9315029b74 100644
--- a/src/kits/tracker/TemplatesMenu.cpp
+++ b/src/kits/tracker/TemplatesMenu.cpp
@@ -53,8 +53,8 @@ All rights reserved.
 #include "MimeTypes.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TemplatesMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TemplatesMenu"
 
 
 namespace BPrivate {
diff --git a/src/kits/tracker/TextWidget.cpp b/src/kits/tracker/TextWidget.cpp
index 7a54d92f4e..da368cfbcc 100644
--- a/src/kits/tracker/TextWidget.cpp
+++ b/src/kits/tracker/TextWidget.cpp
@@ -55,8 +55,8 @@ All rights reserved.
 #include "WidgetAttributeText.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TextWidget"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TextWidget"
 
 const float kWidthMargin = 20;
 
diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index 5fe7f0ba23..178afe2690 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -205,8 +205,8 @@ GetVolumeFlags(Model *model)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Tracker"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Tracker"
 
 TTracker::TTracker()
 	:	BApplication(kTrackerSignature),
diff --git a/src/kits/tracker/TrackerInitialState.cpp b/src/kits/tracker/TrackerInitialState.cpp
index bfaf138364..ca1dc12eb2 100644
--- a/src/kits/tracker/TrackerInitialState.cpp
+++ b/src/kits/tracker/TrackerInitialState.cpp
@@ -332,8 +332,8 @@ AddTemporaryBackgroundImages(BMessage *message, const char *imagePath,
 // #pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TrackerInitialState"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TrackerInitialState"
 
 bool
 TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
diff --git a/src/kits/tracker/TrackerSettingsWindow.cpp b/src/kits/tracker/TrackerSettingsWindow.cpp
index 3085610e58..42cc6904b3 100644
--- a/src/kits/tracker/TrackerSettingsWindow.cpp
+++ b/src/kits/tracker/TrackerSettingsWindow.cpp
@@ -66,8 +66,8 @@ const uint32 kDefaultsButtonPressed = 'Apbp';
 const uint32 kRevertButtonPressed = 'Rebp';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TrackerSettingsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TrackerSettingsWindow"
 
 TrackerSettingsWindow::TrackerSettingsWindow()
 	:
diff --git a/src/kits/tracker/VolumeWindow.cpp b/src/kits/tracker/VolumeWindow.cpp
index 4ede52a0ff..a43bc87148 100644
--- a/src/kits/tracker/VolumeWindow.cpp
+++ b/src/kits/tracker/VolumeWindow.cpp
@@ -50,8 +50,8 @@ All rights reserved.
 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "VolumeWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "VolumeWindow"
 
 BVolumeWindow::BVolumeWindow(LockingList *windowList, uint32 openFlags)
 	:	BContainerWindow(windowList, openFlags)
diff --git a/src/kits/tracker/WidgetAttributeText.cpp b/src/kits/tracker/WidgetAttributeText.cpp
index f2f2b1fbb8..6fd7df3e80 100644
--- a/src/kits/tracker/WidgetAttributeText.cpp
+++ b/src/kits/tracker/WidgetAttributeText.cpp
@@ -66,8 +66,8 @@ All rights reserved.
 #include "ViewState.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "WidgetAttributeText"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "WidgetAttributeText"
 
 
 const int32 kGenericReadBufferSize = 1024;
diff --git a/src/libs/icon/transformer/TransformerFactory.cpp b/src/libs/icon/transformer/TransformerFactory.cpp
index a0467458b7..f9d525601b 100644
--- a/src/libs/icon/transformer/TransformerFactory.cpp
+++ b/src/libs/icon/transformer/TransformerFactory.cpp
@@ -17,8 +17,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Transformation"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Transformation"
 #endif
 
 
diff --git a/src/preferences/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp
index 952efad6c4..32533af441 100644
--- a/src/preferences/appearance/APRView.cpp
+++ b/src/preferences/appearance/APRView.cpp
@@ -30,8 +30,8 @@
 #include "ColorSet.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Colors tab"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Colors tab"
 
 #define COLOR_DROPPED 'cldp'
 #define DECORATOR_CHANGED 'dcch'
diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp
index dbc2ff5329..ee5a7a6f57 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -26,8 +26,8 @@
 #include "FontView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "APRWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "APRWindow"
 
 
 static const uint32 kMsgSetDefaults = 'dflt';
diff --git a/src/preferences/appearance/AntialiasingSettingsView.cpp b/src/preferences/appearance/AntialiasingSettingsView.cpp
index b6912248b2..7e5b4af077 100644
--- a/src/preferences/appearance/AntialiasingSettingsView.cpp
+++ b/src/preferences/appearance/AntialiasingSettingsView.cpp
@@ -28,8 +28,8 @@
 
 #include "APRWindow.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AntialiasingSettingsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AntialiasingSettingsView"
 
 
 //#define DISABLE_HINTING_CONTROL
diff --git a/src/preferences/appearance/ColorSet.cpp b/src/preferences/appearance/ColorSet.cpp
index 9e55517260..757f711d8a 100644
--- a/src/preferences/appearance/ColorSet.cpp
+++ b/src/preferences/appearance/ColorSet.cpp
@@ -21,8 +21,8 @@
 #include 
 #include "ColorSet.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Colors tab"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Colors tab"
 
 static ColorDescription sColorDescriptionTable[] =
 {
diff --git a/src/preferences/appearance/DecorSettingsView.cpp b/src/preferences/appearance/DecorSettingsView.cpp
index d5afffd4ca..d2106f2d7b 100644
--- a/src/preferences/appearance/DecorSettingsView.cpp
+++ b/src/preferences/appearance/DecorSettingsView.cpp
@@ -30,8 +30,8 @@
 #include "APRWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DecorSettingsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DecorSettingsView"
 
 
 static const int32 kMsgSetDecor = 'deco';
diff --git a/src/preferences/appearance/FontSelectionView.cpp b/src/preferences/appearance/FontSelectionView.cpp
index 3f00f53b35..e638b50386 100644
--- a/src/preferences/appearance/FontSelectionView.cpp
+++ b/src/preferences/appearance/FontSelectionView.cpp
@@ -26,8 +26,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Font Selection view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Font Selection view"
 
 
 #define INSTANT_UPDATE
diff --git a/src/preferences/appearance/FontView.cpp b/src/preferences/appearance/FontView.cpp
index 0159dcf45e..3a686e47b5 100644
--- a/src/preferences/appearance/FontView.cpp
+++ b/src/preferences/appearance/FontView.cpp
@@ -26,8 +26,8 @@
 #include "FontSelectionView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Font view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Font view"
 
 
 static const uint32 kMsgCheckFonts = 'chkf';
diff --git a/src/preferences/backgrounds/Backgrounds.cpp b/src/preferences/backgrounds/Backgrounds.cpp
index dbccab9854..3eb2669e20 100644
--- a/src/preferences/backgrounds/Backgrounds.cpp
+++ b/src/preferences/backgrounds/Backgrounds.cpp
@@ -18,8 +18,8 @@
 #include "BackgroundsView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main Window"
 
 
 static const char* kSignature = "application/x-vnd.Haiku-Backgrounds";
diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp
index cefb60ab10..bcbe54849e 100644
--- a/src/preferences/backgrounds/BackgroundsView.cpp
+++ b/src/preferences/backgrounds/BackgroundsView.cpp
@@ -33,8 +33,8 @@
 #include "ImageFilePanel.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main View"
 
 
 static const uint32 kMsgApplySettings = 'aply';
diff --git a/src/preferences/backgrounds/ImageFilePanel.cpp b/src/preferences/backgrounds/ImageFilePanel.cpp
index 414ef102f9..89b1e3b813 100644
--- a/src/preferences/backgrounds/ImageFilePanel.cpp
+++ b/src/preferences/backgrounds/ImageFilePanel.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Image Filepanel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Image Filepanel"
 
 
 ImageFilePanel::ImageFilePanel(file_panel_mode mode, BMessenger* target,
diff --git a/src/preferences/bluetooth/BluetoothDeviceView.cpp b/src/preferences/bluetooth/BluetoothDeviceView.cpp
index 52372f8a3d..cb8203edee 100644
--- a/src/preferences/bluetooth/BluetoothDeviceView.cpp
+++ b/src/preferences/bluetooth/BluetoothDeviceView.cpp
@@ -18,8 +18,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Device View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Device View"
 
 BluetoothDeviceView::BluetoothDeviceView(BRect frame, BluetoothDevice* bDevice,
 	uint32 resizingMode, uint32 flags)
diff --git a/src/preferences/bluetooth/BluetoothMain.cpp b/src/preferences/bluetooth/BluetoothMain.cpp
index b3fc9abd36..c76142f883 100644
--- a/src/preferences/bluetooth/BluetoothMain.cpp
+++ b/src/preferences/bluetooth/BluetoothMain.cpp
@@ -14,8 +14,8 @@
 #include "defs.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 BluetoothApplication::BluetoothApplication(void)
  :	BApplication(BLUETOOTH_APP_SIGNATURE)
diff --git a/src/preferences/bluetooth/BluetoothSettingsView.cpp b/src/preferences/bluetooth/BluetoothSettingsView.cpp
index b5f6bb5768..f2e893d00c 100644
--- a/src/preferences/bluetooth/BluetoothSettingsView.cpp
+++ b/src/preferences/bluetooth/BluetoothSettingsView.cpp
@@ -26,8 +26,8 @@
 #include "BluetoothWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Settings view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Settings view"
 
 static const int32 kMsgSetConnectionPolicy = 'sCpo';
 
diff --git a/src/preferences/bluetooth/BluetoothWindow.cpp b/src/preferences/bluetooth/BluetoothWindow.cpp
index c80178a293..87c1938222 100644
--- a/src/preferences/bluetooth/BluetoothWindow.cpp
+++ b/src/preferences/bluetooth/BluetoothWindow.cpp
@@ -20,8 +20,8 @@
 #include "defs.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Window"
 
 static const uint32 kMsgSetDefaults = 'dflt';
 static const uint32 kMsgRevert = 'rvrt';
diff --git a/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp b/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
index 2bac4f9832..afa5bce6b4 100644
--- a/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
+++ b/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp
@@ -16,8 +16,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Extended local device view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Extended local device view"
 
 ExtendedLocalDeviceView::ExtendedLocalDeviceView(BRect frame,
 	LocalDevice* bDevice, uint32 resizingMode, uint32 flags)
diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp
index 2d2bc7b806..7f6560e303 100644
--- a/src/preferences/bluetooth/InquiryPanel.cpp
+++ b/src/preferences/bluetooth/InquiryPanel.cpp
@@ -26,8 +26,8 @@
 #include "InquiryPanel.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Inquiry panel"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Inquiry panel"
 
 using Bluetooth::DeviceListItem;
 
diff --git a/src/preferences/bluetooth/RemoteDevicesView.cpp b/src/preferences/bluetooth/RemoteDevicesView.cpp
index c6ac12f200..e4ebf54560 100644
--- a/src/preferences/bluetooth/RemoteDevicesView.cpp
+++ b/src/preferences/bluetooth/RemoteDevicesView.cpp
@@ -26,8 +26,8 @@
 #include "RemoteDevicesView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Remote devices"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Remote devices"
 
 static const uint32 kMsgAddDevices = 'ddDv';
 static const uint32 kMsgRemoveDevice = 'rmDv';
diff --git a/src/preferences/cpufrequency/CPUFrequencyView.cpp b/src/preferences/cpufrequency/CPUFrequencyView.cpp
index 7ef91d8471..8ec880ec72 100644
--- a/src/preferences/cpufrequency/CPUFrequencyView.cpp
+++ b/src/preferences/cpufrequency/CPUFrequencyView.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "CPU Frequency View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "CPU Frequency View"
 
 
 const char* kCPUFreqPreferencesFile = "CPUFrequency";
diff --git a/src/preferences/cpufrequency/ColorStepView.cpp b/src/preferences/cpufrequency/ColorStepView.cpp
index 9c302664f1..bbb793c478 100644
--- a/src/preferences/cpufrequency/ColorStepView.cpp
+++ b/src/preferences/cpufrequency/ColorStepView.cpp
@@ -15,8 +15,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Color Step View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Color Step View"
 
 
 const int32 kColorBarHeight = 15;
diff --git a/src/preferences/cpufrequency/PreferencesWindow.h b/src/preferences/cpufrequency/PreferencesWindow.h
index e903c09821..914beec62b 100644
--- a/src/preferences/cpufrequency/PreferencesWindow.h
+++ b/src/preferences/cpufrequency/PreferencesWindow.h
@@ -34,8 +34,8 @@
 #endif
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Pref Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Pref Window"
 
 // messages PrefFileWatcher
 const uint32 kUpdatedPreferences = '&UdP';
@@ -479,6 +479,6 @@ PreferencesWindow::_UpdateButtons()
 }
 
 
-#undef B_TRANSLATE_CONTEXT
+#undef B_TRANSLATION_CONTEXT
 
 #endif	// PREFERENCES_WINDOW_h
diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp
index 859954edef..3d7a651b66 100644
--- a/src/preferences/cpufrequency/StatusView.cpp
+++ b/src/preferences/cpufrequency/StatusView.cpp
@@ -30,8 +30,8 @@
 extern "C" _EXPORT BView *instantiate_deskbar_item(void);
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Status view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Status view"
 #define MAX_FREQ_STRING "9999MHz"
 
 
diff --git a/src/preferences/cpufrequency/main.cpp b/src/preferences/cpufrequency/main.cpp
index 2d44e18afe..f24d576241 100644
--- a/src/preferences/cpufrequency/main.cpp
+++ b/src/preferences/cpufrequency/main.cpp
@@ -15,8 +15,8 @@
 #include "PreferencesWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main window"
 
 
 int
diff --git a/src/preferences/datatranslations/DataTranslations.cpp b/src/preferences/datatranslations/DataTranslations.cpp
index 6d35f78b97..2c9ff0157e 100644
--- a/src/preferences/datatranslations/DataTranslations.cpp
+++ b/src/preferences/datatranslations/DataTranslations.cpp
@@ -24,8 +24,8 @@
 #include "DataTranslationsWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DataTranslations"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DataTranslations"
 
 
 const char* kApplicationSignature = "application/x-vnd.Haiku-DataTranslations";
diff --git a/src/preferences/datatranslations/DataTranslationsWindow.cpp b/src/preferences/datatranslations/DataTranslationsWindow.cpp
index 8b652355d2..41e8bb326d 100644
--- a/src/preferences/datatranslations/DataTranslationsWindow.cpp
+++ b/src/preferences/datatranslations/DataTranslationsWindow.cpp
@@ -40,8 +40,8 @@
 #include "TranslatorListView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DataTranslations"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DataTranslations"
 
 
 const uint32 kMsgTranslatorInfo = 'trin';
diff --git a/src/preferences/filetypes/ApplicationTypeWindow.cpp b/src/preferences/filetypes/ApplicationTypeWindow.cpp
index 400debe2ee..9c651cc787 100644
--- a/src/preferences/filetypes/ApplicationTypeWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypeWindow.cpp
@@ -44,8 +44,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Application Type Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Application Type Window"
 
 
 const uint32 kMsgSave = 'save';
diff --git a/src/preferences/filetypes/ApplicationTypesWindow.cpp b/src/preferences/filetypes/ApplicationTypesWindow.cpp
index 1d094a92d7..4927d1490e 100644
--- a/src/preferences/filetypes/ApplicationTypesWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypesWindow.cpp
@@ -43,8 +43,8 @@
 // TODO: think about adopting Tracker's info window style here (pressable path)
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Application Types Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Application Types Window"
 
 
 class ProgressWindow : public BWindow {
diff --git a/src/preferences/filetypes/AttributeWindow.cpp b/src/preferences/filetypes/AttributeWindow.cpp
index 645ca3fb20..9d451564ca 100644
--- a/src/preferences/filetypes/AttributeWindow.cpp
+++ b/src/preferences/filetypes/AttributeWindow.cpp
@@ -31,8 +31,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Attribute Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Attribute Window"
 
 
 const uint32 kMsgAttributeUpdated = 'atup';
diff --git a/src/preferences/filetypes/ExtensionWindow.cpp b/src/preferences/filetypes/ExtensionWindow.cpp
index ac1171e80e..8dd2b07b1c 100644
--- a/src/preferences/filetypes/ExtensionWindow.cpp
+++ b/src/preferences/filetypes/ExtensionWindow.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Extension Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Extension Window"
 
 
 const uint32 kMsgExtensionUpdated = 'exup';
diff --git a/src/preferences/filetypes/FileTypeWindow.cpp b/src/preferences/filetypes/FileTypeWindow.cpp
index 6cbb25a1ca..2a7248ab13 100644
--- a/src/preferences/filetypes/FileTypeWindow.cpp
+++ b/src/preferences/filetypes/FileTypeWindow.cpp
@@ -32,8 +32,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FileType Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FileType Window"
 
 
 const uint32 kMsgTypeEntered = 'type';
diff --git a/src/preferences/filetypes/FileTypes.cpp b/src/preferences/filetypes/FileTypes.cpp
index d29609990b..91ec41bc2f 100644
--- a/src/preferences/filetypes/FileTypes.cpp
+++ b/src/preferences/filetypes/FileTypes.cpp
@@ -27,8 +27,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FileTypes"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FileTypes"
 
 
 const char* kSignature = "application/x-vnd.Haiku-FileTypes";
diff --git a/src/preferences/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp
index 1827410262..a5d840a95f 100644
--- a/src/preferences/filetypes/FileTypesWindow.cpp
+++ b/src/preferences/filetypes/FileTypesWindow.cpp
@@ -48,8 +48,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "FileTypes Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "FileTypes Window"
 
 
 const uint32 kMsgTypeSelected = 'typs';
diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp
index 577ef982df..145eacd727 100644
--- a/src/preferences/filetypes/IconView.cpp
+++ b/src/preferences/filetypes/IconView.cpp
@@ -27,8 +27,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Icon View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Icon View"
 
 
 using namespace std;
diff --git a/src/preferences/filetypes/NewFileTypeWindow.cpp b/src/preferences/filetypes/NewFileTypeWindow.cpp
index 68ee4c637a..a5987554a1 100644
--- a/src/preferences/filetypes/NewFileTypeWindow.cpp
+++ b/src/preferences/filetypes/NewFileTypeWindow.cpp
@@ -27,8 +27,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "New File Type Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "New File Type Window"
 
 
 const uint32 kMsgSupertypeChosen = 'sptc';
diff --git a/src/preferences/filetypes/PreferredAppMenu.cpp b/src/preferences/filetypes/PreferredAppMenu.cpp
index efd3ee706d..55933b319a 100644
--- a/src/preferences/filetypes/PreferredAppMenu.cpp
+++ b/src/preferences/filetypes/PreferredAppMenu.cpp
@@ -21,8 +21,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Preferred App Menu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Preferred App Menu"
 
 
 static int
diff --git a/src/preferences/filetypes/TypeListWindow.cpp b/src/preferences/filetypes/TypeListWindow.cpp
index c3aa9c92f1..8f7e493bad 100644
--- a/src/preferences/filetypes/TypeListWindow.cpp
+++ b/src/preferences/filetypes/TypeListWindow.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Type List Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Type List Window"
 
 
 const uint32 kMsgTypeSelected = 'tpsl';
diff --git a/src/preferences/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp
index 023f747ea9..270658880f 100644
--- a/src/preferences/fonts/FontSelectionView.cpp
+++ b/src/preferences/fonts/FontSelectionView.cpp
@@ -26,8 +26,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Font Selection view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Font Selection view"
 
 
 #define INSTANT_UPDATE
diff --git a/src/preferences/fonts/FontView.cpp b/src/preferences/fonts/FontView.cpp
index 4e00462db8..0634fe49e1 100644
--- a/src/preferences/fonts/FontView.cpp
+++ b/src/preferences/fonts/FontView.cpp
@@ -20,8 +20,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Font view"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Font view"
 
 static void
 add_font_selection_view(BGridLayout* layout, FontSelectionView* view,
diff --git a/src/preferences/fonts/MainWindow.cpp b/src/preferences/fonts/MainWindow.cpp
index 7f5b4173df..8fb49b93a0 100644
--- a/src/preferences/fonts/MainWindow.cpp
+++ b/src/preferences/fonts/MainWindow.cpp
@@ -29,8 +29,8 @@
 
 #include "FontView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Main window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Main window"
 
 
 static const uint32 kMsgSetDefaults = 'dflt';
diff --git a/src/preferences/fonts/main.cpp b/src/preferences/fonts/main.cpp
index 70f7e3ef4b..c46fa4ab57 100644
--- a/src/preferences/fonts/main.cpp
+++ b/src/preferences/fonts/main.cpp
@@ -17,8 +17,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "main"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "main"
 
 class FontsApp : public BApplication {
 	public:
diff --git a/src/preferences/keyboard/Keyboard.cpp b/src/preferences/keyboard/Keyboard.cpp
index 74d13a3f53..91c8d74314 100644
--- a/src/preferences/keyboard/Keyboard.cpp
+++ b/src/preferences/keyboard/Keyboard.cpp
@@ -15,8 +15,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "KeyboardApplication"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "KeyboardApplication"
 
 KeyboardApplication::KeyboardApplication()
 	: BApplication("application/x-vnd.Haiku-Keyboard")
diff --git a/src/preferences/keyboard/KeyboardView.cpp b/src/preferences/keyboard/KeyboardView.cpp
index 454f9ee0c4..b17f9f63de 100644
--- a/src/preferences/keyboard/KeyboardView.cpp
+++ b/src/preferences/keyboard/KeyboardView.cpp
@@ -23,8 +23,8 @@
 #include "KeyboardMessages.h"
 #include "KeyboardSettings.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "KeyboardView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "KeyboardView"
 
 KeyboardView::KeyboardView()
  :	BGroupView()
diff --git a/src/preferences/keyboard/KeyboardWindow.cpp b/src/preferences/keyboard/KeyboardWindow.cpp
index 013ebf48c6..ee421981bf 100644
--- a/src/preferences/keyboard/KeyboardWindow.cpp
+++ b/src/preferences/keyboard/KeyboardWindow.cpp
@@ -24,8 +24,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "KeyboardWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "KeyboardWindow"
 
 KeyboardWindow::KeyboardWindow()
 	:
diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp
index 0d8b0ef7d3..de078ef4f3 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -39,8 +39,8 @@
 #include "KeymapListItem.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Keymap window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Keymap window"
 
 
 static const uint32 kMsgMenuFileOpen = 'mMFO';
diff --git a/src/preferences/keymap/ModifierKeysWindow.cpp b/src/preferences/keymap/ModifierKeysWindow.cpp
index 8863645330..9596359513 100644
--- a/src/preferences/keymap/ModifierKeysWindow.cpp
+++ b/src/preferences/keymap/ModifierKeysWindow.cpp
@@ -61,8 +61,8 @@ static const uint32 kMsgApplyModifiers 		= 'apmd';
 static const uint32 kMsgRevertModifiers		= 'rvmd';
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Modifier keys window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Modifier keys window"
 
 
 ModifierKeysWindow::ModifierKeysWindow()
diff --git a/src/preferences/locale/FormatSettingsView.cpp b/src/preferences/locale/FormatSettingsView.cpp
index 9470a980b4..2ea8cd4d59 100644
--- a/src/preferences/locale/FormatSettingsView.cpp
+++ b/src/preferences/locale/FormatSettingsView.cpp
@@ -41,8 +41,8 @@
 using BPrivate::MutableLocaleRoster;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TimeFormatSettings"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TimeFormatSettings"
 
 
 // #pragma mark -
diff --git a/src/preferences/locale/LanguageListView.cpp b/src/preferences/locale/LanguageListView.cpp
index cabd665262..63dd27c2f0 100644
--- a/src/preferences/locale/LanguageListView.cpp
+++ b/src/preferences/locale/LanguageListView.cpp
@@ -28,8 +28,8 @@
 #define MAX_DRAG_HEIGHT		200.0
 #define ALPHA				170
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "LanguageListView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "LanguageListView"
 
 
 static const float kLeftInset = 4;
diff --git a/src/preferences/locale/LocalePreflet.cpp b/src/preferences/locale/LocalePreflet.cpp
index 69897f9267..5db4bfb600 100644
--- a/src/preferences/locale/LocalePreflet.cpp
+++ b/src/preferences/locale/LocalePreflet.cpp
@@ -17,8 +17,8 @@
 #include "LocaleWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Locale Preflet"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Locale Preflet"
 
 
 const char* kSignature = "application/x-vnd.Haiku-Locale";
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index 56757f9fe8..a112a9cffc 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -34,8 +34,8 @@
 using BPrivate::MutableLocaleRoster;
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Locale Preflet Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Locale Preflet Window"
 
 
 static const uint32 kMsgLanguageInvoked = 'LaIv';
diff --git a/src/preferences/mail/AutoConfigView.cpp b/src/preferences/mail/AutoConfigView.cpp
index b4e57c3fba..95a92b34b1 100644
--- a/src/preferences/mail/AutoConfigView.cpp
+++ b/src/preferences/mail/AutoConfigView.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "E-Mail"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "E-Mail"
 
 
 AutoConfigView::AutoConfigView(BRect rect, AutoConfig &config)
diff --git a/src/preferences/mail/AutoConfigWindow.cpp b/src/preferences/mail/AutoConfigWindow.cpp
index a400ee8d15..2ffeb8d56b 100644
--- a/src/preferences/mail/AutoConfigWindow.cpp
+++ b/src/preferences/mail/AutoConfigWindow.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AutoConfigWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AutoConfigWindow"
 
 
 AutoConfigWindow::AutoConfigWindow(BRect rect, ConfigWindow *parent)
diff --git a/src/preferences/mail/ConfigViews.cpp b/src/preferences/mail/ConfigViews.cpp
index 95570dec39..6e4cbaae9e 100644
--- a/src/preferences/mail/ConfigViews.cpp
+++ b/src/preferences/mail/ConfigViews.cpp
@@ -31,8 +31,8 @@
 #include "FilterConfigView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Config Views"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Config Views"
 
 
 // AccountConfigView
diff --git a/src/preferences/mail/ConfigWindow.cpp b/src/preferences/mail/ConfigWindow.cpp
index 26c2ecad95..e3b4ce3698 100644
--- a/src/preferences/mail/ConfigWindow.cpp
+++ b/src/preferences/mail/ConfigWindow.cpp
@@ -53,8 +53,8 @@
 #include "CenterContainer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Config Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Config Window"
 
 
 using std::nothrow;
diff --git a/src/preferences/mail/FilterConfigView.cpp b/src/preferences/mail/FilterConfigView.cpp
index 0590b7199e..ce330b8858 100644
--- a/src/preferences/mail/FilterConfigView.cpp
+++ b/src/preferences/mail/FilterConfigView.cpp
@@ -19,8 +19,8 @@
 
 #include "CenterContainer.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Config Views"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Config Views"
 
 
 // FiltersConfigView
diff --git a/src/preferences/media/MediaViews.cpp b/src/preferences/media/MediaViews.cpp
index 9917371bbf..17096844b4 100644
--- a/src/preferences/media/MediaViews.cpp
+++ b/src/preferences/media/MediaViews.cpp
@@ -33,8 +33,8 @@
 #include "MediaWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Media views"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Media views"
 
 #define MEDIA_DEFAULT_INPUT_CHANGE 'dich'
 #define MEDIA_DEFAULT_OUTPUT_CHANGE 'doch'
diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp
index 62a189efa5..9d599b8529 100644
--- a/src/preferences/media/MediaWindow.cpp
+++ b/src/preferences/media/MediaWindow.cpp
@@ -38,8 +38,8 @@
 #include "MediaIcons.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Media Window"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Media Window"
 
 
 const uint32 ML_SELECTED_NODE = 'MlSN';
diff --git a/src/preferences/mouse/Mouse.cpp b/src/preferences/mouse/Mouse.cpp
index ccc900aebb..e6a20e7895 100644
--- a/src/preferences/mouse/Mouse.cpp
+++ b/src/preferences/mouse/Mouse.cpp
@@ -15,8 +15,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MouseApplication"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MouseApplication"
 
 const char* kSignature = "application/x-vnd.Haiku-Mouse";
 
diff --git a/src/preferences/mouse/MouseWindow.cpp b/src/preferences/mouse/MouseWindow.cpp
index effe6bec1c..48d1023487 100644
--- a/src/preferences/mouse/MouseWindow.cpp
+++ b/src/preferences/mouse/MouseWindow.cpp
@@ -29,8 +29,8 @@
 #include "MouseConstants.h"
 #include "SettingsView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MouseWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MouseWindow"
 
 MouseWindow::MouseWindow(BRect _rect)
 	:
diff --git a/src/preferences/mouse/SettingsView.cpp b/src/preferences/mouse/SettingsView.cpp
index ecec410d07..db5b690575 100644
--- a/src/preferences/mouse/SettingsView.cpp
+++ b/src/preferences/mouse/SettingsView.cpp
@@ -65,8 +65,8 @@ focus_follows_mouse_mode_to_index(mode_focus_follows_mouse mode)
 
 //	#pragma mark -
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SettingsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsView"
 
 SettingsView::SettingsView(MouseSettings& settings)
 	: BBox("main_view"),
diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp
index 0250b24768..8a238938ba 100644
--- a/src/preferences/network/EthernetSettingsView.cpp
+++ b/src/preferences/network/EthernetSettingsView.cpp
@@ -87,8 +87,8 @@ MatchPattern(const char* string, const char* pattern)
 //	#pragma mark -
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "EthernetSettingsView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "EthernetSettingsView"
 
 
 EthernetSettingsView::EthernetSettingsView()
diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp
index 13d7df2931..a0bb0603c4 100644
--- a/src/preferences/network/NetworkWindow.cpp
+++ b/src/preferences/network/NetworkWindow.cpp
@@ -17,8 +17,8 @@
 #include "EthernetSettingsView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NetworkWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NetworkWindow"
 
 
 NetworkWindow::NetworkWindow()
diff --git a/src/preferences/notifications/DisplayView.cpp b/src/preferences/notifications/DisplayView.cpp
index d36883d046..e7972157e6 100644
--- a/src/preferences/notifications/DisplayView.cpp
+++ b/src/preferences/notifications/DisplayView.cpp
@@ -31,8 +31,8 @@
 #include "SettingsHost.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DisplayView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DisplayView"
 
 
 DisplayView::DisplayView(SettingsHost* host)
diff --git a/src/preferences/notifications/GeneralView.cpp b/src/preferences/notifications/GeneralView.cpp
index 68e827576d..081bf89681 100644
--- a/src/preferences/notifications/GeneralView.cpp
+++ b/src/preferences/notifications/GeneralView.cpp
@@ -37,8 +37,8 @@
 #include "GeneralView.h"
 #include "SettingsHost.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "GeneralView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "GeneralView"
 const int32 kServer = '_TSR';
 
 const char* kStartServer = B_TRANSLATE("Enable notifications");
diff --git a/src/preferences/notifications/NotificationsView.cpp b/src/preferences/notifications/NotificationsView.cpp
index 4795399d42..be9f1b1c11 100644
--- a/src/preferences/notifications/NotificationsView.cpp
+++ b/src/preferences/notifications/NotificationsView.cpp
@@ -26,8 +26,8 @@
 
 #include "NotificationsView.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NotificationView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NotificationView"
 
 const float kEdgePadding = 5.0;
 const float kCLVTitlePadding = 8.0;
diff --git a/src/preferences/notifications/PrefletView.cpp b/src/preferences/notifications/PrefletView.cpp
index 8b4377a028..230054aa08 100644
--- a/src/preferences/notifications/PrefletView.cpp
+++ b/src/preferences/notifications/PrefletView.cpp
@@ -21,8 +21,8 @@
 #include "NotificationsView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrefletView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrefletView"
 
 
 const int32 kPageSelected = '_LCH';
diff --git a/src/preferences/notifications/PrefletWin.cpp b/src/preferences/notifications/PrefletWin.cpp
index dba6a7a6bb..6813bdc44a 100644
--- a/src/preferences/notifications/PrefletWin.cpp
+++ b/src/preferences/notifications/PrefletWin.cpp
@@ -17,8 +17,8 @@
 #include "PrefletView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrefletWin"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrefletWin"
 
 
 const int32 kRevert = '_RVT';
diff --git a/src/preferences/printers/AddPrinterDialog.cpp b/src/preferences/printers/AddPrinterDialog.cpp
index b0c24b922e..2b0a39606e 100644
--- a/src/preferences/printers/AddPrinterDialog.cpp
+++ b/src/preferences/printers/AddPrinterDialog.cpp
@@ -33,8 +33,8 @@
 #include "TransportMenu.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AddPrinterDialog"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AddPrinterDialog"
 
 
 AddPrinterDialog::AddPrinterDialog(BWindow *parent)
diff --git a/src/preferences/printers/JobListView.cpp b/src/preferences/printers/JobListView.cpp
index f16d424f70..473ec65102 100644
--- a/src/preferences/printers/JobListView.cpp
+++ b/src/preferences/printers/JobListView.cpp
@@ -24,8 +24,8 @@
 #include "SpoolFolder.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "JobListView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "JobListView"
 
 
 // #pragma mark -- JobListView
diff --git a/src/preferences/printers/PrinterListView.cpp b/src/preferences/printers/PrinterListView.cpp
index f2d3391228..bfc5f50814 100644
--- a/src/preferences/printers/PrinterListView.cpp
+++ b/src/preferences/printers/PrinterListView.cpp
@@ -24,8 +24,8 @@
 #include "SpoolFolder.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrinterListView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrinterListView"
 
 
 // #pragma mark -- PrinterListView
diff --git a/src/preferences/printers/PrintersWindow.cpp b/src/preferences/printers/PrintersWindow.cpp
index bcdc9f8539..32f0ec0700 100644
--- a/src/preferences/printers/PrintersWindow.cpp
+++ b/src/preferences/printers/PrintersWindow.cpp
@@ -33,8 +33,8 @@
 #include "SpoolFolder.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintersWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintersWindow"
 
 
 class TestPageWindow : public BWindow {
diff --git a/src/preferences/printers/TestPageView.cpp b/src/preferences/printers/TestPageView.cpp
index 77c9d6df97..1708d318d1 100644
--- a/src/preferences/printers/TestPageView.cpp
+++ b/src/preferences/printers/TestPageView.cpp
@@ -27,8 +27,8 @@
 #include "PrinterListView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TestPageView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TestPageView"
 
 
 // #pragma mark LeafView
diff --git a/src/preferences/printers/TransportMenu.cpp b/src/preferences/printers/TransportMenu.cpp
index ad2bbca8a9..b27c249d03 100644
--- a/src/preferences/printers/TransportMenu.cpp
+++ b/src/preferences/printers/TransportMenu.cpp
@@ -13,8 +13,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TransportMenu"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TransportMenu"
 
 
 TransportMenu::TransportMenu(const char* title, uint32 what,
diff --git a/src/preferences/screen/AlertView.cpp b/src/preferences/screen/AlertView.cpp
index d51c899710..1105abeca1 100644
--- a/src/preferences/screen/AlertView.cpp
+++ b/src/preferences/screen/AlertView.cpp
@@ -26,8 +26,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 AlertView::AlertView(BRect frame, const char *name)
diff --git a/src/preferences/screen/AlertWindow.cpp b/src/preferences/screen/AlertWindow.cpp
index 16ba7a9b0d..51943fd429 100644
--- a/src/preferences/screen/AlertWindow.cpp
+++ b/src/preferences/screen/AlertWindow.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 AlertWindow::AlertWindow(BMessenger target)
diff --git a/src/preferences/screen/MonitorView.cpp b/src/preferences/screen/MonitorView.cpp
index 6d0776f2f9..bf15d9f266 100644
--- a/src/preferences/screen/MonitorView.cpp
+++ b/src/preferences/screen/MonitorView.cpp
@@ -21,8 +21,8 @@
 
 #include "Constants.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Monitor View"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Monitor View"
 
 
 MonitorView::MonitorView(BRect rect, const char *name, int32 width, int32 height)
diff --git a/src/preferences/screen/RefreshSlider.cpp b/src/preferences/screen/RefreshSlider.cpp
index c16674c376..5194d65992 100644
--- a/src/preferences/screen/RefreshSlider.cpp
+++ b/src/preferences/screen/RefreshSlider.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 RefreshSlider::RefreshSlider(BRect frame, float min, float max, uint32 resizingMode)
diff --git a/src/preferences/screen/RefreshWindow.cpp b/src/preferences/screen/RefreshWindow.cpp
index 7c9468b675..7b1df327c1 100644
--- a/src/preferences/screen/RefreshWindow.cpp
+++ b/src/preferences/screen/RefreshWindow.cpp
@@ -23,8 +23,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 RefreshWindow::RefreshWindow(BPoint position, float current, float min, float max)
diff --git a/src/preferences/screen/ScreenApplication.cpp b/src/preferences/screen/ScreenApplication.cpp
index c4f4e4bed3..fc87e7a33b 100644
--- a/src/preferences/screen/ScreenApplication.cpp
+++ b/src/preferences/screen/ScreenApplication.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 static const char* kAppSignature = "application/x-vnd.Haiku-Screen";
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 3c42a18340..f2199d9312 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -63,8 +63,8 @@
 #include "multimon.h"	// the usual: DANGER WILL, ROBINSON!
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Screen"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Screen"
 
 
 const char* kBackgroundsSignature = "application/x-vnd.Haiku-Backgrounds";
diff --git a/src/preferences/screensaver/PasswordWindow.cpp b/src/preferences/screensaver/PasswordWindow.cpp
index b1f871f917..661ff4d18b 100644
--- a/src/preferences/screensaver/PasswordWindow.cpp
+++ b/src/preferences/screensaver/PasswordWindow.cpp
@@ -21,8 +21,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ScreenSaver"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ScreenSaver"
 
 const uint32 kMsgDone = 'done';
 const uint32 kMsgPasswordTypeChanged = 'pwtp';
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index aba857ca65..21a4c6e421 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -40,8 +40,8 @@
 #include "ScreenCornerSelector.h"
 #include "ScreenSaverItem.h"
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ScreenSaver"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ScreenSaver"
 
 const uint32 kPreviewMonitorGap = 16;
 const uint32 kMinSettingsWidth = 230;
diff --git a/src/preferences/shortcuts/ShortcutsApp.cpp b/src/preferences/shortcuts/ShortcutsApp.cpp
index 7662966dc3..8d8ff2d7c2 100644
--- a/src/preferences/shortcuts/ShortcutsApp.cpp
+++ b/src/preferences/shortcuts/ShortcutsApp.cpp
@@ -15,8 +15,8 @@
 #include "ShortcutsWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ShortcutsApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ShortcutsApp"
 
 
 ShortcutsApp::ShortcutsApp()
diff --git a/src/preferences/shortcuts/ShortcutsSpec.cpp b/src/preferences/shortcuts/ShortcutsSpec.cpp
index 0dbe1da191..8992de37ac 100644
--- a/src/preferences/shortcuts/ShortcutsSpec.cpp
+++ b/src/preferences/shortcuts/ShortcutsSpec.cpp
@@ -32,8 +32,8 @@
 
 #define CLASS "ShortcutsSpec : "
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ShortcutsSpec"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ShortcutsSpec"
 
 const float _height = 20.0f;
 
diff --git a/src/preferences/shortcuts/ShortcutsWindow.cpp b/src/preferences/shortcuts/ShortcutsWindow.cpp
index e70321296d..6632f2e190 100644
--- a/src/preferences/shortcuts/ShortcutsWindow.cpp
+++ b/src/preferences/shortcuts/ShortcutsWindow.cpp
@@ -59,8 +59,8 @@
 	// the "shortcut_catcher" input_server filter, it should not be overloaded
 	// with window position information.  Instead, a separate file is used.
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ShortcutsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ShortcutsWindow"
 
 #define ERROR "Shortcuts error"
 #define WARNING "Shortcuts warning"
diff --git a/src/preferences/sounds/HApp.cpp b/src/preferences/sounds/HApp.cpp
index 759acf9a2a..bdc2409b65 100644
--- a/src/preferences/sounds/HApp.cpp
+++ b/src/preferences/sounds/HApp.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SoundsHApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SoundsHApp"
 
 
 HApp::HApp()
diff --git a/src/preferences/sounds/HEventList.cpp b/src/preferences/sounds/HEventList.cpp
index 8ec36f34fc..afb04edc61 100644
--- a/src/preferences/sounds/HEventList.cpp
+++ b/src/preferences/sounds/HEventList.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HEventList"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HEventList"
 
 
 HEventRow::HEventRow(const char* name, const char* path)
diff --git a/src/preferences/sounds/HWindow.cpp b/src/preferences/sounds/HWindow.cpp
index 8b0a92deae..06efd30f28 100644
--- a/src/preferences/sounds/HWindow.cpp
+++ b/src/preferences/sounds/HWindow.cpp
@@ -38,8 +38,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "HWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "HWindow"
 
 static const char kSettingsFile[] = "Sounds_Settings";
 
diff --git a/src/preferences/time/DateTimeView.cpp b/src/preferences/time/DateTimeView.cpp
index a5de5c554d..1d0cc649e9 100644
--- a/src/preferences/time/DateTimeView.cpp
+++ b/src/preferences/time/DateTimeView.cpp
@@ -35,8 +35,8 @@
 #include "TimeWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 
 using BPrivate::BCalendarView;
diff --git a/src/preferences/time/NetworkTimeView.cpp b/src/preferences/time/NetworkTimeView.cpp
index 8e85b1ca91..49a34dd4e0 100644
--- a/src/preferences/time/NetworkTimeView.cpp
+++ b/src/preferences/time/NetworkTimeView.cpp
@@ -29,8 +29,8 @@
 #include "TimeMessages.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 
 Settings::Settings()
diff --git a/src/preferences/time/Time.cpp b/src/preferences/time/Time.cpp
index 44977e6f9b..6fb180540e 100644
--- a/src/preferences/time/Time.cpp
+++ b/src/preferences/time/Time.cpp
@@ -23,8 +23,8 @@
 #include "TimeWindow.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 
 const char* kAppSignature = "application/x-vnd.Haiku-Time";
diff --git a/src/preferences/time/TimeWindow.cpp b/src/preferences/time/TimeWindow.cpp
index e5f0ef7b20..8b226ee4ae 100644
--- a/src/preferences/time/TimeWindow.cpp
+++ b/src/preferences/time/TimeWindow.cpp
@@ -26,8 +26,8 @@
 #include "ZoneView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 TTimeWindow::TTimeWindow()
 	:
diff --git a/src/preferences/time/ZoneView.cpp b/src/preferences/time/ZoneView.cpp
index 920b4d22f2..41ed9d4281 100644
--- a/src/preferences/time/ZoneView.cpp
+++ b/src/preferences/time/ZoneView.cpp
@@ -55,8 +55,8 @@
 #include "TZDisplay.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 
 using BPrivate::MutableLocaleRoster;
diff --git a/src/preferences/time/ntp.cpp b/src/preferences/time/ntp.cpp
index f2e7a2afce..7ee56be4a1 100644
--- a/src/preferences/time/ntp.cpp
+++ b/src/preferences/time/ntp.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Time"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Time"
 
 
 /* This structure and its data fields are described in RFC 1305
diff --git a/src/preferences/touchpad/TouchpadPrefView.cpp b/src/preferences/touchpad/TouchpadPrefView.cpp
index 78f3d801e1..b6f9d2624e 100644
--- a/src/preferences/touchpad/TouchpadPrefView.cpp
+++ b/src/preferences/touchpad/TouchpadPrefView.cpp
@@ -34,8 +34,8 @@
 const uint32 SCROLL_X_DRAG = 'sxdr';
 const uint32 SCROLL_Y_DRAG = 'sydr';
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TouchpadPrefView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TouchpadPrefView"
 
 
 TouchpadView::TouchpadView(BRect frame)
diff --git a/src/preferences/touchpad/main.cpp b/src/preferences/touchpad/main.cpp
index e4318b9e0c..4e1027e99b 100644
--- a/src/preferences/touchpad/main.cpp
+++ b/src/preferences/touchpad/main.cpp
@@ -35,8 +35,8 @@ public:
 };
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "TouchpadMain"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "TouchpadMain"
 
 
 int
diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index 7e86a9cdbd..7328806bd6 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -31,8 +31,8 @@
 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SettingsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SettingsWindow"
 
 
 static const uint32 kMsgDefaults = 'dflt';
diff --git a/src/preferences/virtualmemory/VirtualMemory.cpp b/src/preferences/virtualmemory/VirtualMemory.cpp
index 333dd6a523..60fdfdaeee 100644
--- a/src/preferences/virtualmemory/VirtualMemory.cpp
+++ b/src/preferences/virtualmemory/VirtualMemory.cpp
@@ -11,8 +11,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "VirtualMemoryApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "VirtualMemoryApp"
 
 
 VirtualMemory::VirtualMemory()
diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp
index 28701ce961..83e49709c5 100644
--- a/src/servers/debug/DebugServer.cpp
+++ b/src/servers/debug/DebugServer.cpp
@@ -37,8 +37,8 @@
 #define HANDOVER_USE_GDB 1
 //#define HANDOVER_USE_DEBUGGER 1
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DebugServer"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DebugServer"
 
 #define USE_GUI true
 	// define to false if the debug server shouldn't use GUI (i.e. an alert)
diff --git a/src/servers/mail/DeskbarView.cpp b/src/servers/mail/DeskbarView.cpp
index 5d5c30febf..22618bfe38 100644
--- a/src/servers/mail/DeskbarView.cpp
+++ b/src/servers/mail/DeskbarView.cpp
@@ -41,8 +41,8 @@
 #include "DeskbarViewIcons.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "DeskbarView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "DeskbarView"
 
 
 const char* kTrackerSignature = "application/x-vnd.Be-TRAK";
diff --git a/src/servers/mail/MailDaemon.cpp b/src/servers/mail/MailDaemon.cpp
index 9c0a317e5f..b12bcbe7fa 100644
--- a/src/servers/mail/MailDaemon.cpp
+++ b/src/servers/mail/MailDaemon.cpp
@@ -33,8 +33,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "MailDaemon"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "MailDaemon"
 
 
 using std::map;
diff --git a/src/servers/mail/Notifier.cpp b/src/servers/mail/Notifier.cpp
index 11633e5500..6a690960a5 100644
--- a/src/servers/mail/Notifier.cpp
+++ b/src/servers/mail/Notifier.cpp
@@ -13,8 +13,8 @@
 #include "Notifier.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Notifier"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Notifier"
 
 
 DefaultNotifier::DefaultNotifier(const char* accountName, bool inbound,
diff --git a/src/servers/mount/AutoMounter.cpp b/src/servers/mount/AutoMounter.cpp
index 662ef48278..65afd9079a 100644
--- a/src/servers/mount/AutoMounter.cpp
+++ b/src/servers/mount/AutoMounter.cpp
@@ -41,8 +41,8 @@
 #include "MountServer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "AutoMounter"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "AutoMounter"
 
 
 static const char* kMountServerSettings = "mount_server";
diff --git a/src/servers/notification/NotificationWindow.cpp b/src/servers/notification/NotificationWindow.cpp
index 8ab97941e4..39bdf1eaa8 100644
--- a/src/servers/notification/NotificationWindow.cpp
+++ b/src/servers/notification/NotificationWindow.cpp
@@ -31,8 +31,8 @@
 #include "AppUsage.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NotificationWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NotificationWindow"
 
 
 property_info main_prop_list[] = {
diff --git a/src/servers/print/ConfigWindow.cpp b/src/servers/print/ConfigWindow.cpp
index d4befd6c05..a88ea61c1d 100644
--- a/src/servers/print/ConfigWindow.cpp
+++ b/src/servers/print/ConfigWindow.cpp
@@ -30,8 +30,8 @@
 #include "PrintUtils.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ConfigWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ConfigWindow"
 
 
 static const float a0_width = 2380.0;
diff --git a/src/servers/print/PrintServerApp.R5.cpp b/src/servers/print/PrintServerApp.R5.cpp
index 3190160ef1..c89948f29a 100644
--- a/src/servers/print/PrintServerApp.R5.cpp
+++ b/src/servers/print/PrintServerApp.R5.cpp
@@ -20,8 +20,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintServerApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintServerApp"
 
 
 struct AsyncThreadParams {
diff --git a/src/servers/print/PrintServerApp.Scripting.cpp b/src/servers/print/PrintServerApp.Scripting.cpp
index c01be45aca..d663ff5ffe 100644
--- a/src/servers/print/PrintServerApp.Scripting.cpp
+++ b/src/servers/print/PrintServerApp.Scripting.cpp
@@ -19,8 +19,8 @@
 #include "Printer.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintServerApp Scripting"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintServerApp Scripting"
 
 
 static property_info prop_list[] = {
diff --git a/src/servers/print/PrintServerApp.cpp b/src/servers/print/PrintServerApp.cpp
index 495c41cc81..3ed7566c33 100644
--- a/src/servers/print/PrintServerApp.cpp
+++ b/src/servers/print/PrintServerApp.cpp
@@ -37,8 +37,8 @@
 	// for unlink
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "PrintServerApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "PrintServerApp"
 
 
 typedef struct _printer_data {
diff --git a/src/servers/print/Printer.Scripting.cpp b/src/servers/print/Printer.Scripting.cpp
index 325cc4f5db..1972ca6ce3 100644
--- a/src/servers/print/Printer.Scripting.cpp
+++ b/src/servers/print/Printer.Scripting.cpp
@@ -19,8 +19,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Printer Scripting"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Printer Scripting"
 
 
 static property_info prop_list[] = {
diff --git a/src/servers/print/Transport.Scripting.cpp b/src/servers/print/Transport.Scripting.cpp
index a0e2b5e5c3..bd668350d0 100644
--- a/src/servers/print/Transport.Scripting.cpp
+++ b/src/servers/print/Transport.Scripting.cpp
@@ -17,8 +17,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Transport Scripting"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Transport Scripting"
 
 
 static property_info prop_list[] = {
diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp
index 3482119424..02a2a719e1 100644
--- a/src/servers/registrar/ShutdownProcess.cpp
+++ b/src/servers/registrar/ShutdownProcess.cpp
@@ -48,8 +48,8 @@
 #include "TRoster.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ShutdownProcess"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ShutdownProcess"
 
 
 using std::nothrow;
diff --git a/src/servers/syslog_daemon/SyslogDaemon.cpp b/src/servers/syslog_daemon/SyslogDaemon.cpp
index 989a756bae..993638df48 100644
--- a/src/servers/syslog_daemon/SyslogDaemon.cpp
+++ b/src/servers/syslog_daemon/SyslogDaemon.cpp
@@ -18,8 +18,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "SyslogDaemon"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "SyslogDaemon"
 
 const char *kSignature = "application/x-vnd.Haiku-SystemLogger";
 
diff --git a/src/tests/kits/game/chart/Chart.cpp b/src/tests/kits/game/chart/Chart.cpp
index e61f99eb4b..0dad69f69f 100644
--- a/src/tests/kits/game/chart/Chart.cpp
+++ b/src/tests/kits/game/chart/Chart.cpp
@@ -17,8 +17,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Chart"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Chart"
 
 int
 main()
diff --git a/src/tests/kits/game/chart/ChartWindow.cpp b/src/tests/kits/game/chart/ChartWindow.cpp
index 38dbf062d2..3a273b1775 100644
--- a/src/tests/kits/game/chart/ChartWindow.cpp
+++ b/src/tests/kits/game/chart/ChartWindow.cpp
@@ -39,8 +39,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ChartWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ChartWindow"
 
 /* pseudo-random generator parameters (not very good ones,
    but good enough for what we do here). */
diff --git a/src/tests/kits/locale/catalogSpeed.cpp b/src/tests/kits/locale/catalogSpeed.cpp
index 62399bd63f..fc086489da 100644
--- a/src/tests/kits/locale/catalogSpeed.cpp
+++ b/src/tests/kits/locale/catalogSpeed.cpp
@@ -36,7 +36,7 @@ class CatalogSpeed {
 		void TestIdLookup();
 };
 
-#define B_TRANSLATE_CONTEXT "CatalogSpeed"
+#define B_TRANSLATION_CONTEXT "CatalogSpeed"
 
 #define catSig "x-vnd.Be.locale.catalogSpeed"
 #define catName catSig".catalog"
@@ -47,7 +47,7 @@ CatalogSpeed::TestCreation()
 {
 	for (uint32 i = 0; i < kNumStrings; i++) {
 		strs[i] << "native-string#" << 1000000+i;
-		ctxs[i] << B_TRANSLATE_CONTEXT;
+		ctxs[i] << B_TRANSLATION_CONTEXT;
 		trls[i] << "translation#" << 4000000+i;
 	}
 
diff --git a/src/tests/kits/locale/catalogTest.cpp b/src/tests/kits/locale/catalogTest.cpp
index b683b074ab..a65e97f2cd 100644
--- a/src/tests/kits/locale/catalogTest.cpp
+++ b/src/tests/kits/locale/catalogTest.cpp
@@ -22,7 +22,7 @@ class CatalogTest {
 		void Check();
 };
 
-#define B_TRANSLATE_CONTEXT "CatalogTest"
+#define B_TRANSLATION_CONTEXT "CatalogTest"
 
 
 #define catSig "x-vnd.Be.locale.catalogTest"
@@ -34,7 +34,7 @@ CatalogTest::Run()
 	printf("app...");
 	status_t res;
 	BString s;
-	s << "string" << "\x01" << B_TRANSLATE_CONTEXT << "\x01";
+	s << "string" << "\x01" << B_TRANSLATION_CONTEXT << "\x01";
 	size_t hashVal = CatKey::HashFun(s.String());
 	assert(be_locale != NULL);
 	system("mkdir -p ./locale/catalogs/"catSig);
@@ -44,7 +44,7 @@ CatalogTest::Run()
 	assert(cata.InitCheck() == B_OK);
 
 	// ...and populate the catalog with some data:
-	res = cata.SetString("string", "Schnur", B_TRANSLATE_CONTEXT);
+	res = cata.SetString("string", "Schnur", B_TRANSLATION_CONTEXT);
 	assert(res == B_OK);
 	res = cata.SetString(hashVal, "Schnur_id");
 		// add a second entry for the same hash-value, but with different
@@ -55,13 +55,14 @@ CatalogTest::Run()
 	res = cata.SetString("string", "Textpuffer", "programming",
 		"Deutsches Fachbuch");
 	assert(res == B_OK);
-	res = cata.SetString("string", "Leine", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch");
+	res = cata.SetString("string", "Leine", B_TRANSLATION_CONTEXT,
+		"Deutsches Fachbuch");
 	assert(res == B_OK);
 	res = cata.WriteToFile("./locale/catalogs/"catSig"/german.catalog");
 	assert(res == B_OK);
 
 	// check if we are getting back the correct strings:
-	s = cata.GetString(("string"), B_TRANSLATE_CONTEXT);
+	s = cata.GetString(("string"), B_TRANSLATION_CONTEXT);
 	assert(s == "Schnur");
 	s = cata.GetString(hashVal);
 	assert(s == "Schnur_id");
@@ -69,7 +70,7 @@ CatalogTest::Run()
 	assert(s == "String");
 	s = cata.GetString("string", "programming", "Deutsches Fachbuch");
 	assert(s == "Textpuffer");
-	s = cata.GetString("string", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch");
+	s = cata.GetString("string", B_TRANSLATION_CONTEXT, "Deutsches Fachbuch");
 	assert(s == "Leine");
 
 	// now we create a new (base) catalog and embed this one into the app-file:
@@ -83,7 +84,7 @@ CatalogTest::Run()
 	assert(res == B_OK);
 	// the following string will be hidden by the definition inside the
 	// german catalog:
-	res = catb.SetString("string", "hidden", B_TRANSLATE_CONTEXT);
+	res = catb.SetString("string", "hidden", B_TRANSLATION_CONTEXT);
 	assert(res == B_OK);
 	app_info appInfo;
 	res = be_app->GetAppInfo(&appInfo);
@@ -103,7 +104,7 @@ CatalogTest::Check()
 	status_t res;
 	printf("app-check...");
 	BString s;
-	s << "string" << "\x01" << B_TRANSLATE_CONTEXT << "\x01";
+	s << "string" << "\x01" << B_TRANSLATION_CONTEXT << "\x01";
 	size_t hashVal = CatKey::HashFun(s.String());
 	// ok, we now try to re-load the catalog that has just been written:
 	//
diff --git a/src/tests/kits/locale/catalogTestAddOn.cpp b/src/tests/kits/locale/catalogTestAddOn.cpp
index f28f4a9ffc..d19dddc558 100644
--- a/src/tests/kits/locale/catalogTestAddOn.cpp
+++ b/src/tests/kits/locale/catalogTestAddOn.cpp
@@ -16,7 +16,7 @@ class CatalogTestAddOn {
 		void Check();
 };
 
-#define B_TRANSLATE_CONTEXT "CatalogTestAddOn"
+#define B_TRANSLATION_CONTEXT "CatalogTestAddOn"
 
 #define catSig "add-ons/catalogTest/catalogTestAddOn"
 #define catName catSig".catalog"
@@ -27,7 +27,7 @@ CatalogTestAddOn::Run() {
 	printf("addon...");
 	status_t res;
 	BString s;
-	s << "string" << "\x01" << B_TRANSLATE_CONTEXT << "\x01";
+	s << "string" << "\x01" << B_TRANSLATION_CONTEXT << "\x01";
 	size_t hashVal = CatKey::HashFun(s.String());
 	assert(be_locale != NULL);
 	system("mkdir -p ./locale/catalogs/"catSig);
@@ -37,22 +37,25 @@ CatalogTestAddOn::Run() {
 	assert(cat1.InitCheck() == B_OK);
 
 	// ...and populate the catalog with some data:
-	res = cat1.SetString("string", "Schnur_A", B_TRANSLATE_CONTEXT);
+	res = cat1.SetString("string", "Schnur_A", B_TRANSLATION_CONTEXT);
 	assert(res == B_OK);
 	res = cat1.SetString(hashVal, "Schnur_id_A");
-		// add a second entry for the same hash-value, but with different translation
+		// add a second entry for the same hash-value, but with different
+		// translation
 	assert(res == B_OK);
 	res = cat1.SetString("string", "String_A", "programming");
 	assert(res == B_OK);
-	res = cat1.SetString("string", "Textpuffer_A", "programming", "Deutsches Fachbuch");
+	res = cat1.SetString("string", "Textpuffer_A", "programming",
+		"Deutsches Fachbuch");
 	assert(res == B_OK);
-	res = cat1.SetString("string", "Leine_A", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch");
+	res = cat1.SetString("string", "Leine_A", B_TRANSLATION_CONTEXT,
+		"Deutsches Fachbuch");
 	assert(res == B_OK);
 	res = cat1.WriteToFile("./locale/catalogs/"catSig"/german.catalog");
 	assert(res == B_OK);
 
 	// check if we are getting back the correct strings:
-	s = cat1.GetString("string", B_TRANSLATE_CONTEXT);
+	s = cat1.GetString("string", B_TRANSLATION_CONTEXT);
 	assert(s == "Schnur_A");
 	s = cat1.GetString(hashVal);
 	assert(s == "Schnur_id_A");
@@ -60,10 +63,11 @@ CatalogTestAddOn::Run() {
 	assert(s == "String_A");
 	s = cat1.GetString("string", "programming", "Deutsches Fachbuch");
 	assert(s == "Textpuffer_A");
-	s = cat1.GetString("string", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch");
+	s = cat1.GetString("string", B_TRANSLATION_CONTEXT, "Deutsches Fachbuch");
 	assert(s == "Leine_A");
 
-	// now we create a new (base) catalog and embed this one into the add-on-file:
+	// now we create a new (base) catalog and embed this one into the
+	// add-on-file:
 	BPrivate::EditableCatalog cat2("Default", catSig, "English");
 	assert(cat2.InitCheck() == B_OK);
 	// the following string is unique to the embedded catalog:
@@ -72,8 +76,9 @@ CatalogTestAddOn::Run() {
 	// the following id is unique to the embedded catalog:
 	res = cat2.SetString(32, "hashed string_A");
 	assert(res == B_OK);
-	// the following string will be hidden by the definition inside the german catalog:
-	res = cat2.SetString("string", "hidden_A", B_TRANSLATE_CONTEXT);
+	// the following string will be hidden by the definition inside the german
+	// catalog:
+	res = cat2.SetString("string", "hidden_A", B_TRANSLATION_CONTEXT);
 	assert(res == B_OK);
 	entry_ref addOnRef;
 	res = get_add_on_ref(&addOnRef);
@@ -91,7 +96,7 @@ CatalogTestAddOn::Check() {
 	status_t res;
 	printf("addon-check...");
 	BString s;
-	s << "string" << "\x01" << B_TRANSLATE_CONTEXT << "\x01";
+	s << "string" << "\x01" << B_TRANSLATION_CONTEXT << "\x01";
 	size_t hashVal = CatKey::HashFun(s.String());
 	// ok, we now try to re-load the catalog that has just been written:
 	//
@@ -143,9 +148,11 @@ CatalogTestAddOn::Check() {
 	assert(res == B_OK);
 	s = be_app_catalog->GetString("string", "CatalogTest");
 	assert(s == "Schnur");
-	s = be_app_catalog->GetString("string", "CatalogTest", "Deutsches Fachbuch");
+	s = be_app_catalog->GetString("string", "CatalogTest",
+		"Deutsches Fachbuch");
 	assert(s == "Leine");
-	s = be_app_catalog->GetString("string", "programming", "Deutsches Fachbuch");
+	s = be_app_catalog->GetString("string", "programming",
+		"Deutsches Fachbuch");
 	assert(s == "Textpuffer");
 
 	printf("ok.\n");
diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp
index dcb87aacae..ece7e8bdee 100644
--- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp
+++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp
@@ -14,8 +14,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "NetworkSetupWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "NetworkSetupWindow"
 
 
 InterfaceWindow::InterfaceWindow(NetworkSettings* settings)
diff --git a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
index e8b7bb9bfe..1750f96a5d 100644
--- a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
+++ b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp
@@ -25,8 +25,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT	"NetworkSetupWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT	"NetworkSetupWindow"
 
 
 // --------------------------------------------------------------
diff --git a/src/tests/kits/opengl/glinfo/CapabilitiesView.cpp b/src/tests/kits/opengl/glinfo/CapabilitiesView.cpp
index df02aa3b92..f7ff7f7fb6 100644
--- a/src/tests/kits/opengl/glinfo/CapabilitiesView.cpp
+++ b/src/tests/kits/opengl/glinfo/CapabilitiesView.cpp
@@ -24,8 +24,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Capabilities"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Capabilities"
 
 
 CapabilitiesView::CapabilitiesView()
diff --git a/src/tests/kits/opengl/glinfo/ExtensionsView.cpp b/src/tests/kits/opengl/glinfo/ExtensionsView.cpp
index 806bb9a989..bd864e7305 100644
--- a/src/tests/kits/opengl/glinfo/ExtensionsView.cpp
+++ b/src/tests/kits/opengl/glinfo/ExtensionsView.cpp
@@ -22,8 +22,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "Extensions"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "Extensions"
 
 
 ExtensionsView::ExtensionsView()
diff --git a/src/tests/kits/opengl/glinfo/InfoView.cpp b/src/tests/kits/opengl/glinfo/InfoView.cpp
index fd211384ec..73818e6c82 100644
--- a/src/tests/kits/opengl/glinfo/InfoView.cpp
+++ b/src/tests/kits/opengl/glinfo/InfoView.cpp
@@ -24,8 +24,8 @@
 #include 
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InfoView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InfoView"
 
 
 const BAlignment kLabelAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET);
diff --git a/src/tests/kits/opengl/glinfo/OpenGLView.cpp b/src/tests/kits/opengl/glinfo/OpenGLView.cpp
index 9d694d860e..b4138b0c60 100644
--- a/src/tests/kits/opengl/glinfo/OpenGLView.cpp
+++ b/src/tests/kits/opengl/glinfo/OpenGLView.cpp
@@ -28,8 +28,8 @@
 #include "GearsView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "OpenGLView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "OpenGLView"
 
 
 OpenGLView::OpenGLView()
diff --git a/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp b/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
index a9e3e9ef07..dde16f7f1e 100644
--- a/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
+++ b/src/tests/kits/opengl/glinfo/OpenGLWindow.cpp
@@ -17,8 +17,8 @@
 #include "OpenGLView.h"
 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "OpenGLWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "OpenGLWindow"
 
 
 OpenGLWindow::OpenGLWindow()
diff --git a/src/tools/translation/inspector/ActiveTranslatorsWindow.cpp b/src/tools/translation/inspector/ActiveTranslatorsWindow.cpp
index 370177df9a..aeaf29e4f1 100644
--- a/src/tools/translation/inspector/ActiveTranslatorsWindow.cpp
+++ b/src/tools/translation/inspector/ActiveTranslatorsWindow.cpp
@@ -44,8 +44,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ActiveTranslatorsWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ActiveTranslatorsWindow"
 
 
 ActiveTranslatorsWindow::ActiveTranslatorsWindow(BRect rect, const char *name,
diff --git a/src/tools/translation/inspector/ImageView.cpp b/src/tools/translation/inspector/ImageView.cpp
index 3fe113a4df..1e7dd1c729 100644
--- a/src/tools/translation/inspector/ImageView.cpp
+++ b/src/tools/translation/inspector/ImageView.cpp
@@ -61,8 +61,8 @@
 #define BORDER_HEIGHT 16
 #define PEN_SIZE 1.0f
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ImageView"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ImageView"
 
 
 ImageView::ImageView(BRect rect, const char *name)
diff --git a/src/tools/translation/inspector/ImageWindow.cpp b/src/tools/translation/inspector/ImageWindow.cpp
index 7e03a70590..531b3e5b0d 100644
--- a/src/tools/translation/inspector/ImageWindow.cpp
+++ b/src/tools/translation/inspector/ImageWindow.cpp
@@ -40,8 +40,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "ImageWindow"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "ImageWindow"
 
 
 ImageWindow::ImageWindow(BRect rect, const char *name)
diff --git a/src/tools/translation/inspector/InspectorApp.cpp b/src/tools/translation/inspector/InspectorApp.cpp
index 41641d71e7..35e9c83140 100644
--- a/src/tools/translation/inspector/InspectorApp.cpp
+++ b/src/tools/translation/inspector/InspectorApp.cpp
@@ -40,8 +40,8 @@
 #include 
 #include 
 
-#undef B_TRANSLATE_CONTEXT
-#define B_TRANSLATE_CONTEXT "InspectorApp"
+#undef B_TRANSLATION_CONTEXT
+#define B_TRANSLATION_CONTEXT "InspectorApp"
 
 
 InspectorApp::InspectorApp()