[haiku-commits] haiku: hrev44041 - in src: apps preferences add-ons/translators apps/icon-o-matic .

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 16 Apr 2012 21:32:30 +0200 (CEST)

hrev44041 adds 1 changeset to branch 'master'
old head: 3244c2bcf2d56c88a667a5c9263d4947b4cdd4ef
new head: 546208a53940a26c6379c48a7854ade1a8250fc5

----------------------------------------------------------------------------

546208a: 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.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44041
Commit:      546208a53940a26c6379c48a7854ade1a8250fc5
URL:         http://cgit.haiku-os.org/haiku/commit/?id=546208a
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Mon Apr 16 19:31:22 2012 UTC

----------------------------------------------------------------------------

521 files changed, 1171 insertions(+), 1165 deletions(-)
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 ++++++------
.../disk_systems/bfs/InitializeParameterEditor.cpp |    4 +-
.../disk_systems/intel/CreationParameterEditor.cpp |    4 +-
.../devices/keyboard/TeamMonitorWindow.cpp         |    4 +-
.../inbound_filters/match_header/ConfigView.cpp    |    4 +-
.../inbound_filters/match_header/RuleFilter.cpp    |    4 +-
.../inbound_filters/notifier/ConfigView.cpp        |    4 +-
.../inbound_filters/notifier/filter.cpp            |    4 +-
.../inbound_filters/spam_filter/SpamFilter.cpp     |    4 +-
.../spam_filter/SpamFilterConfig.cpp               |    4 +-
.../inbound_protocols/imap/IMAPFolderConfig.cpp    |    4 +-
.../inbound_protocols/imap/imap_config.cpp         |    4 +-
.../inbound_protocols/pop3/ConfigView.cpp          |    4 +-
.../mail_daemon/inbound_protocols/pop3/pop3.cpp    |    4 +-
.../outbound_filters/fortune/ConfigView.cpp        |    4 +-
.../outbound_protocols/smtp/ConfigView.cpp         |    4 +-
.../mail_daemon/outbound_protocols/smtp/smtp.cpp   |    4 +-
.../media/media-add-ons/mixer/AudioMixer.cpp       |    4 +-
src/add-ons/screen_savers/butterfly/Butterfly.cpp  |    4 +-
src/add-ons/screen_savers/debugnow/DebugNow.cpp    |    4 +-
src/add-ons/screen_savers/haiku/ScreenSaver.cpp    |    4 +-
src/add-ons/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 +-
src/add-ons/screen_savers/spider/SpiderSaver.cpp   |    4 +-
src/add-ons/tracker/zipomatic/ZipOMatic.cpp        |    4 +-
src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp  |    4 +-
src/add-ons/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 +-
src/add-ons/translators/hpgs/HPGSTranslator.cpp    |    4 +-
src/add-ons/translators/hvif/HVIFMain.cpp          |    4 +-
src/add-ons/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 +-
src/add-ons/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 +-
.../translators/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 +-
src/add-ons/translators/shared/BaseTranslator.cpp  |    4 +-
.../translators/shared/TranslatorWindow.cpp        |    4 +-
src/add-ons/translators/stxt/STXTMain.cpp          |    4 +-
src/add-ons/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 +-
src/add-ons/translators/tiff/TIFFTranslator.cpp    |    4 +-
src/add-ons/translators/tiff/TIFFView.cpp          |    4 +-
src/add-ons/translators/webp/ConfigView.cpp        |    4 +-
src/add-ons/translators/webp/WebPTranslator.cpp    |    4 +-
src/add-ons/translators/webp/main.cpp              |    4 +-
src/add-ons/translators/wonderbrush/Layer.cpp      |    4 +-
.../translators/wonderbrush/WonderBrushMain.cpp    |    4 +-
.../wonderbrush/WonderBrushTranslator.cpp          |    4 +-
.../translators/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 +-
src/apps/bootmanager/BootManagerController.cpp     |    4 +-
src/apps/bootmanager/BootManagerWindow.cpp         |    4 +-
[ *** stats truncated: 422 lines dropped *** ]

----------------------------------------------------------------------------

diff --git a/docs/develop/makefile-engine.html 
b/docs/develop/makefile-engine.html
index 0df205e..923255e 100644
--- a/docs/develop/makefile-engine.html
+++ b/docs/develop/makefile-engine.html
@@ -166,8 +166,8 @@ engine, last line must contain:</p>
 <pre><code>#include &lt;stdio.h&gt;
 #include &lt;Catalog.h&gt;
 
-#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 94d532e..37948bd 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 c716016..17f6653 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 ac17b52..53db39c 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 <Catalog.h>
 
 
 // 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 0fd2548..50e1253 100644
--- a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
+++ b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
@@ -24,8 +24,8 @@
 #include <Window.h>
 
 
-#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 09f8811..8d0c963 100644
--- a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
+++ b/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
@@ -12,8 +12,8 @@
 #include <PartitionParameterEditor.h>
 #include <View.h>
 
-#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 2f1ae02..03ddd51 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 5d622b7..03e8487 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 <MailSettings.h>
 
 
-#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 686e7d4..512a002 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 <MailProtocol.h>
 
 
-#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 0b6485b..fa9e8fc 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 <MailSettings.h>
 
 
-#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 b22f8ff..4e33116 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 615db89..0a55b77 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 3592548..253134d 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 <FileConfigView.h>
 
 
-#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 214730d..e6180ff 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 <crypt.h>
 
 
-#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 b5128c0..2a22ed7 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 640e00f..312804b 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 <ProtocolConfigView.h>
 
 
-#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 c8c773d..83f2744 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 0db4fc4..be7d4bd 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 <FileConfigView.h>
 
 
-#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 083bea1..6024b56 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 <ProtocolConfigView.h>
 
 
-#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 c13b804..67ee55a 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 a4f1882..b138573 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 0407d41..e012bc2 100644
--- a/src/add-ons/screen_savers/butterfly/Butterfly.cpp
+++ b/src/add-ons/screen_savers/butterfly/Butterfly.cpp
@@ -19,8 +19,8 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
-#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 f138d83..0d5d232 100644
--- a/src/add-ons/screen_savers/debugnow/DebugNow.cpp
+++ b/src/add-ons/screen_savers/debugnow/DebugNow.cpp
@@ -15,8 +15,8 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
-#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 aa9e21d..dcb5a0d 100644
--- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
+++ b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp
@@ -19,8 +19,8 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
-#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 75bb7b1..45c8127 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 106f127..4f38ae9 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 24823e8..c7b217f 100644
--- a/src/add-ons/screen_savers/leaves/Leaves.cpp
+++ b/src/add-ons/screen_savers/leaves/Leaves.cpp
@@ -19,8 +19,8 @@
 #include <TextView.h>
 
 
-#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 690eda3..f45643d 100644
--- a/src/add-ons/screen_savers/message/Message.cpp
+++ b/src/add-ons/screen_savers/message/Message.cpp
@@ -24,8 +24,8 @@
 
 #include <BuildScreenSaverDefaultSettingsView.h>
 
-#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 e4d638b..a5e1261 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 ff314b6..254c311 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 c073f39..197550e 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 71ae619..fa9502d 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 4aa01cb..88d592d 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 cfd0840..75f51d9 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 5714a9c..827e28a 100644
--- a/src/add-ons/translators/bmp/BMPView.cpp
+++ b/src/add-ons/translators/bmp/BMPView.cpp
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 
-#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 c2310cf..887218c 100644
--- a/src/add-ons/translators/exr/ConfigView.cpp
+++ b/src/add-ons/translators/exr/ConfigView.cpp
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 dfc160c..50b49c9 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 a943f4e..e4dd38d 100644
--- a/src/add-ons/translators/exr/main.cpp
+++ b/src/add-ons/translators/exr/main.cpp
@@ -10,8 +10,8 @@
 #include <Application.h>
 #include <Catalog.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/gif/GIFTranslator.cpp 
b/src/add-ons/translators/gif/GIFTranslator.cpp
index 21cc2f4..2867e13 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 c10638f..fba85bd 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 549718e..6a0083f 100644
--- a/src/add-ons/translators/hpgs/ConfigView.cpp
+++ b/src/add-ons/translators/hpgs/ConfigView.cpp
@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 3b5cdae..1261965 100644
--- a/src/add-ons/translators/hpgs/HPGSTranslator.cpp
+++ b/src/add-ons/translators/hpgs/HPGSTranslator.cpp
@@ -18,8 +18,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 aeccf14..f034a5b 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 54c2657..486499f 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 08c5558..debc831 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 8f93c4e..3865cc1 100644
--- a/src/add-ons/translators/ico/ConfigView.cpp
+++ b/src/add-ons/translators/ico/ConfigView.cpp
@@ -16,8 +16,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 50c937b..9410498 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 f633ce7..4044bbe 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 36c5db5..38f4d08 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 <TabView.h>
 #include <TextView.h>
 
-#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 8028fd5..eee87a3 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 41ed71f..fa5b8c2 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 7ed8380..6e73acc 100644
--- a/src/add-ons/translators/jpeg/exif_parser.cpp
+++ b/src/add-ons/translators/jpeg/exif_parser.cpp
@@ -17,8 +17,8 @@
 
 #include <ReadHelper.h>
 
-#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 dcc885d..b2a8fe4 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 <TextView.h>
 
 
-#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 e667900..fc6be22 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 813b48d..d596d24 100644
--- a/src/add-ons/translators/pcx/ConfigView.cpp
+++ b/src/add-ons/translators/pcx/ConfigView.cpp
@@ -16,8 +16,8 @@
 #include <string.h>
 
 
-#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 de3b23c..52b661f 100644
--- a/src/add-ons/translators/pcx/PCXTranslator.cpp
+++ b/src/add-ons/translators/pcx/PCXTranslator.cpp
@@ -14,8 +14,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 76ac344..ec8525d 100644
--- a/src/add-ons/translators/pcx/main.cpp
+++ b/src/add-ons/translators/pcx/main.cpp
@@ -13,8 +13,8 @@
 #include <Catalog.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/png/PNGMain.cpp 
b/src/add-ons/translators/png/PNGMain.cpp
index 6f5e675..6707c9b 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 e83c658..a982ad3 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 97315b9..bde700b 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 <png.h>
 
-#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 d0bc584..d89722b 100644
--- a/src/add-ons/translators/ppm/PPMMain.cpp
+++ b/src/add-ons/translators/ppm/PPMMain.cpp
@@ -15,8 +15,8 @@
 
 #include <stdio.h>
 
-#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 ce6c503..82d444f 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 4044fa5..c3d7bcb 100644
--- a/src/add-ons/translators/raw/ConfigView.cpp
+++ b/src/add-ons/translators/raw/ConfigView.cpp
@@ -17,8 +17,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 666eacb..031a0a6 100644
--- a/src/add-ons/translators/raw/RAWTranslator.cpp
+++ b/src/add-ons/translators/raw/RAWTranslator.cpp
@@ -17,8 +17,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 e0b4770..ba033ea 100644
--- a/src/add-ons/translators/raw/main.cpp
+++ b/src/add-ons/translators/raw/main.cpp
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 a2bd034..300be8d 100644
--- a/src/add-ons/translators/rtf/ConfigView.cpp
+++ b/src/add-ons/translators/rtf/ConfigView.cpp
@@ -12,8 +12,8 @@
 
 #include <stdio.h>
 
-#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 4c3646f..969b871 100644
--- a/src/add-ons/translators/rtf/RTFTranslator.cpp
+++ b/src/add-ons/translators/rtf/RTFTranslator.cpp
@@ -14,8 +14,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 57e8168..e2357b1 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 4685d03..8ab4ed9 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 8753ce2..066a9c6 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 61635db..0e87579 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, <stippi@xxxxxxxxxxxxxxx>";
 
-#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 569bb44..9dbbb6b 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 933cebf..8e075d4 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 34b54ca..bd0b150 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 23d29c3..b2b341a 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 edfb284..9434d16 100644
--- a/src/add-ons/translators/stxt/STXTView.cpp
+++ b/src/add-ons/translators/stxt/STXTView.cpp
@@ -19,8 +19,8 @@
 #include <stdio.h>
 
 
-#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 48da8ba..df8a3ee 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 96f9075..c3ba0b9 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 f27e5e1..9a7c99f 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 9e61799..d274db4 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 e7e07ff..1b836f6 100644
--- a/src/add-ons/translators/tiff/TIFFTranslator.cpp
+++ b/src/add-ons/translators/tiff/TIFFTranslator.cpp
@@ -18,8 +18,8 @@
 #include <string.h>
 
 
-#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 784223e..6ec5e62 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 333a366..44719f3 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 0a4baa8..d3592e8 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 5c42a0b..ab2087e 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 77b7b80..68d9d42 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 e054f0a..3b39fc4 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 6895faa..1a1f436 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 975d38f..ab3b25a 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, <superstippi@xxxxxx>";
diff --git a/src/apps/aboutsystem/AboutSystem.cpp 
b/src/apps/aboutsystem/AboutSystem.cpp
index b43075b..deba9af 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 d8ef0b8..7dc0524 100644
--- a/src/apps/aboutsystem/Utilities.cpp
+++ b/src/apps/aboutsystem/Utilities.cpp
@@ -17,8 +17,8 @@
 #include <Message.h>
 
 
-#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 808dca6..7ac0fd3 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 88a5ae7..e3db9f8 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<typename ObjectType>
 class ListAddDeleter {
diff --git a/src/apps/activitymonitor/ActivityWindow.cpp 
b/src/apps/activitymonitor/ActivityWindow.cpp
index 08b2b84..1882891 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 9fc9a5e..644bf69 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 9fe6690..ad7ad43 100644
--- a/src/apps/activitymonitor/SettingsWindow.cpp
+++ b/src/apps/activitymonitor/SettingsWindow.cpp
@@ -15,8 +15,8 @@
 #include <Slider.h>
 #include <String.h>
 
-#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 4060d7c..4ea4638 100644
--- a/src/apps/bootmanager/BootManager.cpp
+++ b/src/apps/bootmanager/BootManager.cpp
@@ -14,8 +14,8 @@
 #include <Catalog.h>
 
 
-#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 92905f8..f8b1bdb 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 b0b4e39..813f985 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 4cbb95f..b211fd2 100644
--- a/src/apps/bootmanager/DefaultPartitionPage.cpp
+++ b/src/apps/bootmanager/DefaultPartitionPage.cpp
@@ -24,8 +24,8 @@
 #include <TextView.h>
 
 
-#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 ee1a5fc..d96dc33 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 d480fb1..6901524 100644
--- a/src/apps/bootmanager/FileSelectionPage.cpp
+++ b/src/apps/bootmanager/FileSelectionPage.cpp
@@ -20,8 +20,8 @@
 #include <TextView.h>
 
 
-#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 7ed0499..0e30e7c 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 9df64d7..01c3c56 100644
--- a/src/apps/bootmanager/PartitionsPage.cpp
+++ b/src/apps/bootmanager/PartitionsPage.cpp
@@ -28,8 +28,8 @@
 #include <StringForSize.h>
 
 
-#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 a95068a..b175a56 100644
--- a/src/apps/bootmanager/UninstallPage.cpp
+++ b/src/apps/bootmanager/UninstallPage.cpp
@@ -16,8 +16,8 @@
 #include <TextView.h>
 
 
-#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 399a1c1..bbaa92c 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 7363f24..8625d15 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 9dea575..5117b1f 100644
--- a/src/apps/cdplayer/CDPlayer.cpp
+++ b/src/apps/cdplayer/CDPlayer.cpp
@@ -35,8 +35,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#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 9afe5a3..6d5d843 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 0d12f13..9a25108 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 7574103..3f22288 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 79336be..a387949 100644
--- a/src/apps/charactermap/UnicodeBlocks.cpp
+++ b/src/apps/charactermap/UnicodeBlocks.cpp
@@ -8,8 +8,8 @@
 
 #include <Catalog.h>
 
-#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 9c341e3..2a68bce 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -23,8 +23,8 @@
 #include <TranslationKit.h>
 
 
-#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 431e6a9..3939ab0 100644
--- a/src/apps/codycam/FtpClient.cpp
+++ b/src/apps/codycam/FtpClient.cpp
@@ -7,8 +7,8 @@
 #include <Locale.h>
 
 
-#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 f34b377..af06871 100644
--- a/src/apps/codycam/Settings.cpp
+++ b/src/apps/codycam/Settings.cpp
@@ -9,8 +9,8 @@
 #include <Locale.h>
 
 
-#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 6ed6d9d..c04c256 100644
--- a/src/apps/codycam/SettingsHandler.cpp
+++ b/src/apps/codycam/SettingsHandler.cpp
@@ -16,8 +16,8 @@
 #include <StopWatch.h>
 
 
-#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 84892f5..d9b17ea 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 da92599..c764d19 100644
--- a/src/apps/codycam/VideoConsumer.cpp
+++ b/src/apps/codycam/VideoConsumer.cpp
@@ -26,8 +26,8 @@
 #include <View.h>
 
 
-#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 6a3f611..badd8dd 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -61,8 +61,8 @@ All rights reserved.
 #include <MessagePrivate.h>
 
 
-#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 aebfcd1..13a9cad 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 d39c4e2..c1eb196 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 bd42de8..b9aab75 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 6417afc..9aedbee 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 7ce5c02..1342c93 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 d9f4960..3af4579 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 bf36d2e..80151d2 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 49ce98d..823a767 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 92fd385..d306bc8 100644
--- a/src/apps/devices/Device.cpp
+++ b/src/apps/devices/Device.cpp
@@ -13,8 +13,8 @@
 
 #include <Catalog.h>
 
-#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 9bb8e71..291d341 100644
--- a/src/apps/devices/DeviceACPI.cpp
+++ b/src/apps/devices/DeviceACPI.cpp
@@ -14,8 +14,8 @@
 
 #include <Catalog.h>
 
-#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 63ce195..0913373 100644
--- a/src/apps/devices/DevicePCI.cpp
+++ b/src/apps/devices/DevicePCI.cpp
@@ -14,8 +14,8 @@
 
 #include <Catalog.h>
 
-#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 fd38d97..84145f4 100644
--- a/src/apps/devices/DeviceSCSI.cpp
+++ b/src/apps/devices/DeviceSCSI.cpp
@@ -15,8 +15,8 @@
 
 #include <Catalog.h>
 
-#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 3849026..67466e3 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 86e16ef..c14111b 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 df31e7f..28b187d 100644
--- a/src/apps/devices/PropertyList.cpp
+++ b/src/apps/devices/PropertyList.cpp
@@ -12,8 +12,8 @@
 #include <Catalog.h>
 #include <ColumnTypes.h>
 
-#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 cb5548e..0cc13fa 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 b9d70a7..595d6ca 100644
--- a/src/apps/diskprobe/AttributeWindow.cpp
+++ b/src/apps/diskprobe/AttributeWindow.cpp
@@ -22,8 +22,8 @@
 #include <Volume.h>
 
 
-#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 df351af..600a8b9 100644
--- a/src/apps/diskprobe/DiskProbe.cpp
+++ b/src/apps/diskprobe/DiskProbe.cpp
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#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 60b216b..d18f21f 100644
--- a/src/apps/diskprobe/FileWindow.cpp
+++ b/src/apps/diskprobe/FileWindow.cpp
@@ -20,8 +20,8 @@
 #include <be_apps/Tracker/RecentItems.h>
 
 
-#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 0fbb6d8..0ed756f 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 3a35ecc..1087806 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 3f26c83..2fcaea4 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 4c33476..2183ff8 100644
--- a/src/apps/diskprobe/TypeEditors.cpp
+++ b/src/apps/diskprobe/TypeEditors.cpp
@@ -32,8 +32,8 @@
 #include <TranslatorFormats.h>
 
 
-#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 2cdf425..c363d93 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 9c46410..5ab26d7 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 5f378c8..c540ca5 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 e3ec4e6..1be66aa 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 b2e6e1b..9ed5078 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 9bc932a..7584c31 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 2b0f80a..ead2c07 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 771cd52..337b0b5 100644
--- a/src/apps/drivesetup/CreateParamsPanel.cpp
+++ b/src/apps/drivesetup/CreateParamsPanel.cpp
@@ -29,8 +29,8 @@
 #include <String.h>
 
 
-#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 2ce23a7..7dd0df5 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 0a5dddb..6c2f9de 100644
--- a/src/apps/drivesetup/InitParamsPanel.cpp
+++ b/src/apps/drivesetup/InitParamsPanel.cpp
@@ -27,8 +27,8 @@
 #include <TextControl.h>
 
 
-#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 e9694d3..1341f1b 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 3610a5e..49b9b84 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 0f29561..23e19ac 100644
--- a/src/apps/drivesetup/Support.cpp
+++ b/src/apps/drivesetup/Support.cpp
@@ -19,8 +19,8 @@
 #include <String.h>
 
 
-#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 df25f18..5671dc0 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 cefe568..e7fc749 100644
--- a/src/apps/expander/ExpanderPreferences.cpp
+++ b/src/apps/expander/ExpanderPreferences.cpp

[ *** diff truncated: 6212 lines dropped *** ]



Other related posts: