From 4eb0cbb044cf538f18c0d252934a5bcaa33bfd34 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Fri, 7 May 2010 20:19:06 +0000 Subject: [PATCH] Updated TR_CONTEXT to be B_TRANSLATE_CONTEXT, relating to #5408. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36733 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/tracker/zipomatic/ZipOMatic.cpp | 2 +- .../tracker/zipomatic/ZipOMaticWindow.cpp | 2 +- .../tracker/zipomatic/ZipperThread.cpp | 2 +- src/apps/aboutsystem/AboutSystem.cpp | 8 ++--- src/apps/aboutsystem/Utilities.cpp | 4 +-- src/apps/bootman/BootManager.cpp | 4 +-- src/apps/bootman/BootManagerController.cpp | 2 +- src/apps/bootman/BootManagerWindow.cpp | 4 +-- src/apps/bootman/DefaultPartitionPage.cpp | 4 +-- src/apps/bootman/EntryPage.cpp | 4 +-- src/apps/bootman/FileSelectionPage.cpp | 4 +-- src/apps/bootman/LegacyBootDrive.cpp | 4 +-- src/apps/bootman/PartitionsPage.cpp | 4 +-- src/apps/bootman/UninstallPage.cpp | 4 +-- src/apps/bootman/WizardView.cpp | 4 +-- src/apps/deskbar/BeMenu.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/drivesetup/CreateParamsPanel.cpp | 2 +- src/apps/drivesetup/DiskView.cpp | 2 +- src/apps/drivesetup/InitParamsPanel.cpp | 2 +- src/apps/drivesetup/MainWindow.cpp | 2 +- src/apps/drivesetup/PartitionList.cpp | 2 +- src/apps/drivesetup/Support.cpp | 2 +- src/apps/expander/DirectoryFilePanel.cpp | 4 +-- src/apps/expander/ExpanderApp.cpp | 4 +-- src/apps/expander/ExpanderPreferences.cpp | 4 +-- src/apps/expander/ExpanderWindow.cpp | 12 +++---- 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/mail/Content.cpp | 2 +- src/apps/mail/Enclosures.cpp | 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/midiplayer/MidiPlayerApp.cpp | 4 +-- src/apps/midiplayer/MidiPlayerWindow.cpp | 4 +-- src/apps/midiplayer/ScopeView.cpp | 4 +-- .../packageinstaller/PackageImageViewer.cpp | 4 +-- src/apps/packageinstaller/PackageInfo.cpp | 4 +-- src/apps/packageinstaller/PackageInstall.cpp | 4 +-- src/apps/packageinstaller/PackageItem.cpp | 14 ++++---- 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/pairs/PairsView.cpp | 4 +-- src/apps/pairs/PairsWindow.cpp | 4 +-- .../readonlybootprompt/BootPromptWindow.cpp | 4 +-- src/apps/screenshot/ScreenshotWindow.cpp | 4 +-- src/apps/showimage/PrintOptionsWindow.cpp | 4 +-- src/apps/showimage/ProgressWindow.cpp | 4 +-- src/apps/showimage/ResizerWindow.cpp | 4 +-- src/apps/showimage/ShowImageApp.cpp | 4 +-- src/apps/showimage/ShowImageView.cpp | 4 +-- src/apps/showimage/ShowImageWindow.cpp | 16 ++++----- src/apps/stylededit/FindWindow.cpp | 4 +-- src/apps/stylededit/ReplaceWindow.cpp | 4 +-- src/apps/stylededit/StyledEditApp.cpp | 4 +-- src/apps/stylededit/StyledEditWindow.cpp | 36 +++++++++---------- src/apps/terminal/AppearPrefView.cpp | 4 +-- src/apps/terminal/Arguments.cpp | 4 +-- src/apps/terminal/FindWindow.cpp | 4 +-- src/apps/terminal/PrefHandler.cpp | 8 ++--- src/apps/terminal/PrefWindow.cpp | 4 +-- src/apps/terminal/Shell.cpp | 4 +-- src/apps/terminal/SmartTabView.cpp | 4 +-- src/apps/terminal/TermApp.cpp | 4 +-- src/apps/terminal/TermView.cpp | 4 +-- src/apps/terminal/TermWindow.cpp | 4 +-- src/kits/interface/ColorControl.cpp | 4 +-- src/preferences/appearance/APRView.cpp | 4 +-- src/preferences/appearance/APRWindow.cpp | 4 +-- .../appearance/AntialiasingSettingsView.cpp | 4 +-- src/preferences/appearance/ColorSet.cpp | 4 +-- src/preferences/backgrounds/Backgrounds.cpp | 2 +- .../backgrounds/BackgroundsView.cpp | 2 +- .../backgrounds/ImageFilePanel.cpp | 2 +- .../bluetooth/BluetoothDeviceView.cpp | 2 +- src/preferences/bluetooth/BluetoothMain.cpp | 2 +- .../bluetooth/BluetoothSettingsView.cpp | 2 +- src/preferences/bluetooth/BluetoothWindow.cpp | 2 +- .../bluetooth/ExtendedLocalDeviceView.cpp | 2 +- src/preferences/bluetooth/InquiryPanel.cpp | 2 +- .../bluetooth/RemoteDevicesView.cpp | 2 +- .../cpufrequency/CPUFrequencyView.cpp | 2 +- .../cpufrequency/ColorStepView.cpp | 2 +- .../cpufrequency/PreferencesWindow.h | 4 +-- src/preferences/cpufrequency/StatusView.cpp | 18 +++++----- src/preferences/cpufrequency/main.cpp | 2 +- .../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 | 2 +- src/preferences/locale/LanguageListView.cpp | 2 +- src/preferences/locale/Locale.cpp | 2 +- src/preferences/locale/LocaleWindow.cpp | 2 +- .../locale/TimeFormatSettingsView.cpp | 2 +- src/preferences/mail/Account.cpp | 4 +-- src/preferences/mail/ConfigViews.cpp | 4 +-- src/preferences/mail/ConfigWindow.cpp | 4 +-- src/preferences/media/MediaViews.cpp | 2 +- src/preferences/media/MediaWindow.cpp | 2 +- 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/opengl/CapabilitiesView.cpp | 2 +- src/preferences/opengl/ExtensionsList.cpp | 2 +- src/preferences/opengl/ExtensionsView.cpp | 2 +- src/preferences/opengl/InfoView.cpp | 2 +- src/preferences/print/AddPrinterDialog.cpp | 4 +-- src/preferences/print/JobListView.cpp | 4 +-- src/preferences/print/PrinterListView.cpp | 4 +-- src/preferences/print/PrintersWindow.cpp | 4 +-- src/preferences/sounds/HApp.cpp | 4 +-- src/preferences/sounds/HEventList.cpp | 4 +-- src/preferences/sounds/HWindow.cpp | 4 +-- src/preferences/touchpad/TouchpadPrefView.cpp | 4 +-- src/preferences/touchpad/main.cpp | 4 +-- .../virtualmemory/SettingsWindow.cpp | 4 +-- .../virtualmemory/VirtualMemory.cpp | 4 +-- src/servers/print/ConfigWindow.cpp | 6 ++-- src/servers/print/PrintServerApp.R5.cpp | 4 +-- src/servers/print/PrintServerApp.cpp | 4 +-- src/tests/kits/locale/catalogSpeed.cpp | 4 +-- src/tests/kits/locale/catalogTest.cpp | 16 ++++----- src/tests/kits/locale/catalogTestAddOn.cpp | 16 ++++----- .../kits/net/preflet/NetworkSetupWindow.cpp | 4 +-- 159 files changed, 328 insertions(+), 328 deletions(-) diff --git a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp index bf7cc48f71..cb0ad99845 100644 --- a/src/add-ons/tracker/zipomatic/ZipOMatic.cpp +++ b/src/add-ons/tracker/zipomatic/ZipOMatic.cpp @@ -17,7 +17,7 @@ #include "ZipOMaticWindow.h" -#define TR_CONTEXT "file:ZipOMatic.cpp" +#define B_TRANSLATE_CONTEXT "file:ZipOMatic.cpp" int diff --git a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp index c34a632b8f..245afa67d9 100644 --- a/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp +++ b/src/add-ons/tracker/zipomatic/ZipOMaticWindow.cpp @@ -33,7 +33,7 @@ #include "ZipperThread.h" -#define TR_CONTEXT "file:ZipOMaticWindow.cpp" +#define B_TRANSLATE_CONTEXT "file:ZipOMaticWindow.cpp" ZippoWindow::ZippoWindow(BList windowList, bool keepOpen) diff --git a/src/add-ons/tracker/zipomatic/ZipperThread.cpp b/src/add-ons/tracker/zipomatic/ZipperThread.cpp index f61d97062f..b745f65a13 100644 --- a/src/add-ons/tracker/zipomatic/ZipperThread.cpp +++ b/src/add-ons/tracker/zipomatic/ZipperThread.cpp @@ -27,7 +27,7 @@ #include "ZipOMaticWindow.h" -#define TR_CONTEXT "file:ZipperThread.cpp" +#define B_TRANSLATE_CONTEXT "file:ZipperThread.cpp" ZipperThread::ZipperThread(BMessage* refsMessage, BWindow* window) diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 14e6a708ce..6bbc73f853 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -295,8 +295,8 @@ AboutApp::AboutApp() // #pragma mark - -#undef TR_CONTEXT -#define TR_CONTEXT "AboutWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "AboutWindow" AboutWindow::AboutWindow() : BWindow(BRect(0, 0, 500, 300), B_TRANSLATE("About this system"), @@ -438,8 +438,8 @@ CropView::DoLayout() // #pragma mark - AboutView -#undef TR_CONTEXT -#define TR_CONTEXT "AboutView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "AboutView" AboutView::AboutView() : BView("aboutview", B_WILL_DRAW | B_PULSE_NEEDED), diff --git a/src/apps/aboutsystem/Utilities.cpp b/src/apps/aboutsystem/Utilities.cpp index 80666d656e..d8ef0b86a4 100644 --- a/src/apps/aboutsystem/Utilities.cpp +++ b/src/apps/aboutsystem/Utilities.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Utilities" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Utilities" BString diff --git a/src/apps/bootman/BootManager.cpp b/src/apps/bootman/BootManager.cpp index 34fe6c1112..4a9484a4de 100644 --- a/src/apps/bootman/BootManager.cpp +++ b/src/apps/bootman/BootManager.cpp @@ -16,8 +16,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "BootManager" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "BootManager" static const char* kSignature = "application/x-vnd.Haiku-bootman"; diff --git a/src/apps/bootman/BootManagerController.cpp b/src/apps/bootman/BootManagerController.cpp index 9dc2e81f06..fd054c97b3 100644 --- a/src/apps/bootman/BootManagerController.cpp +++ b/src/apps/bootman/BootManagerController.cpp @@ -35,7 +35,7 @@ #include -#define TR_CONTEXT "BootManagerController" +#define B_TRANSLATE_CONTEXT "BootManagerController" BootManagerController::BootManagerController() diff --git a/src/apps/bootman/BootManagerWindow.cpp b/src/apps/bootman/BootManagerWindow.cpp index e0a23caad5..4bd2ae919f 100644 --- a/src/apps/bootman/BootManagerWindow.cpp +++ b/src/apps/bootman/BootManagerWindow.cpp @@ -25,8 +25,8 @@ #include "tracker_private.h" -#undef TR_CONTEXT -#define TR_CONTEXT "BootManagerWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "BootManagerWindow" diff --git a/src/apps/bootman/DefaultPartitionPage.cpp b/src/apps/bootman/DefaultPartitionPage.cpp index 5da4e1df2f..81e889db85 100644 --- a/src/apps/bootman/DefaultPartitionPage.cpp +++ b/src/apps/bootman/DefaultPartitionPage.cpp @@ -23,8 +23,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "DefaultPartitionPage" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "DefaultPartitionPage" enum { diff --git a/src/apps/bootman/EntryPage.cpp b/src/apps/bootman/EntryPage.cpp index 319a162473..995d8cf02f 100644 --- a/src/apps/bootman/EntryPage.cpp +++ b/src/apps/bootman/EntryPage.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "EntryPage" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "EntryPage" EntryPage::EntryPage(BMessage* settings, BRect frame, const char* name) diff --git a/src/apps/bootman/FileSelectionPage.cpp b/src/apps/bootman/FileSelectionPage.cpp index 9b20fdd400..6f35f7be22 100644 --- a/src/apps/bootman/FileSelectionPage.cpp +++ b/src/apps/bootman/FileSelectionPage.cpp @@ -21,8 +21,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FileSelectionPage" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "FileSelectionPage" const uint32 kMsgOpenFilePanel = 'open'; diff --git a/src/apps/bootman/LegacyBootDrive.cpp b/src/apps/bootman/LegacyBootDrive.cpp index 23f4c5bd12..79538bafcb 100644 --- a/src/apps/bootman/LegacyBootDrive.cpp +++ b/src/apps/bootman/LegacyBootDrive.cpp @@ -37,8 +37,8 @@ #include "BootLoader.h" -#undef TR_CONTEXT -#define TR_CONTEXT "LegacyBootDrive" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "LegacyBootDrive" #define USE_SECOND_DISK 0 #define GET_FIRST_BIOS_DRIVE 1 diff --git a/src/apps/bootman/PartitionsPage.cpp b/src/apps/bootman/PartitionsPage.cpp index 1293bd0048..b42aeda8f3 100644 --- a/src/apps/bootman/PartitionsPage.cpp +++ b/src/apps/bootman/PartitionsPage.cpp @@ -24,8 +24,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PartitionsPage" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PartitionsPage" const uint32 kMessageShow = 'show'; diff --git a/src/apps/bootman/UninstallPage.cpp b/src/apps/bootman/UninstallPage.cpp index 54634c96f5..90bbb03110 100644 --- a/src/apps/bootman/UninstallPage.cpp +++ b/src/apps/bootman/UninstallPage.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "UninstallPage" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "UninstallPage" UninstallPage::UninstallPage(BMessage* settings, BRect frame, const char* name) diff --git a/src/apps/bootman/WizardView.cpp b/src/apps/bootman/WizardView.cpp index 12835f48fe..395bece630 100644 --- a/src/apps/bootman/WizardView.cpp +++ b/src/apps/bootman/WizardView.cpp @@ -15,8 +15,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "WizardView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "WizardView" static const float kSeparatorHeight = 2; diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp index eca4533724..5532e1f314 100644 --- a/src/apps/deskbar/BeMenu.cpp +++ b/src/apps/deskbar/BeMenu.cpp @@ -52,8 +52,8 @@ All rights reserved. #include "StatusView.h" #include "tracker_private.h" -#undef TR_CONTEXT -#define TR_CONTEXT "BeMenu" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "BeMenu" #define ROSTER_SIG "application/x-vnd.Be-ROST" diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp index 413e4db3c7..c515308056 100644 --- a/src/apps/deskbar/PreferencesWindow.cpp +++ b/src/apps/deskbar/PreferencesWindow.cpp @@ -24,8 +24,8 @@ #include "StatusView.h" -#undef TR_CONTEXT -#define TR_CONTEXT "PreferencesWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PreferencesWindow" PreferencesWindow::PreferencesWindow(BRect frame) : diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index 33929145db..60353c1929 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -120,8 +120,8 @@ DumpList(BList* itemlist) #endif /* DB_ADDONS */ -#undef TR_CONTEXT -#define TR_CONTEXT "Tray" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Tray" // don't change the name of this view to anything other than "Status"! diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp index ce1509be53..042dad3328 100644 --- a/src/apps/deskbar/TimeView.cpp +++ b/src/apps/deskbar/TimeView.cpp @@ -68,8 +68,8 @@ enum { }; -#undef TR_CONTEXT -#define TR_CONTEXT "TimeView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "TimeView" TTimeView::TTimeView(float maxWidth, float height, bool showSeconds, bool milTime, bool fullDate, bool euroDate, bool) diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp index 651a2a0ab6..895b89059a 100644 --- a/src/apps/deskbar/WindowMenu.cpp +++ b/src/apps/deskbar/WindowMenu.cpp @@ -60,8 +60,8 @@ const int32 kListFloater = 5; const int32 kSystemFloater = 6; -#undef TR_CONTEXT -#define TR_CONTEXT "WindowMenu" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "WindowMenu" bool TWindowMenu::WindowShouldBeListed(uint32 behavior) diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParamsPanel.cpp index 055a218df4..253c713d8d 100644 --- a/src/apps/drivesetup/CreateParamsPanel.cpp +++ b/src/apps/drivesetup/CreateParamsPanel.cpp @@ -28,7 +28,7 @@ #include -#define TR_CONTEXT "CreateParamsPanel" +#define B_TRANSLATE_CONTEXT "CreateParamsPanel" class CreateParamsPanel::EscapeFilter : public BMessageFilter { diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp index 167a1f6b7c..dcb0ec66b9 100644 --- a/src/apps/drivesetup/DiskView.cpp +++ b/src/apps/drivesetup/DiskView.cpp @@ -18,7 +18,7 @@ #include "MainWindow.h" -#define TR_CONTEXT "DiskView" +#define B_TRANSLATE_CONTEXT "DiskView" using BPrivate::HashMap; using BPrivate::HashKey32; diff --git a/src/apps/drivesetup/InitParamsPanel.cpp b/src/apps/drivesetup/InitParamsPanel.cpp index e617139446..d7e38197b9 100644 --- a/src/apps/drivesetup/InitParamsPanel.cpp +++ b/src/apps/drivesetup/InitParamsPanel.cpp @@ -24,7 +24,7 @@ #include -#define TR_CONTEXT "InitParamsPanel" +#define B_TRANSLATE_CONTEXT "InitParamsPanel" class InitParamsPanel::EscapeFilter : public BMessageFilter { diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 37c2ee2915..18c7589a00 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -43,7 +43,7 @@ #include "tracker_private.h" -#define TR_CONTEXT "MainWindow" +#define B_TRANSLATE_CONTEXT "MainWindow" class ListPopulatorVisitor : public BDiskDeviceVisitor { diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp index 83630b06e8..ba79495c63 100644 --- a/src/apps/drivesetup/PartitionList.cpp +++ b/src/apps/drivesetup/PartitionList.cpp @@ -17,7 +17,7 @@ #include "Support.h" -#define TR_CONTEXT "PartitionList" +#define B_TRANSLATE_CONTEXT "PartitionList" // #pragma mark - BBitmapStringField diff --git a/src/apps/drivesetup/Support.cpp b/src/apps/drivesetup/Support.cpp index d3d2dc38e6..42c209c16a 100644 --- a/src/apps/drivesetup/Support.cpp +++ b/src/apps/drivesetup/Support.cpp @@ -18,7 +18,7 @@ #include -#define TR_CONTEXT "Support" +#define B_TRANSLATE_CONTEXT "Support" void diff --git a/src/apps/expander/DirectoryFilePanel.cpp b/src/apps/expander/DirectoryFilePanel.cpp index 67b76e6960..df25f183f5 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 TR_CONTEXT -#define TR_CONTEXT "DirectoryFilePanel" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "DirectoryFilePanel" DirectoryFilePanel::DirectoryFilePanel(file_panel_mode mode, BMessenger* target, diff --git a/src/apps/expander/ExpanderApp.cpp b/src/apps/expander/ExpanderApp.cpp index df5277be6f..f99bbbd0d1 100644 --- a/src/apps/expander/ExpanderApp.cpp +++ b/src/apps/expander/ExpanderApp.cpp @@ -25,8 +25,8 @@ ExpanderApp::ExpanderApp() } -#undef TR_CONTEXT -#define TR_CONTEXT "About" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "About" void ExpanderApp::AboutRequested() diff --git a/src/apps/expander/ExpanderPreferences.cpp b/src/apps/expander/ExpanderPreferences.cpp index 476af5ffe8..9e5073d882 100644 --- a/src/apps/expander/ExpanderPreferences.cpp +++ b/src/apps/expander/ExpanderPreferences.cpp @@ -21,8 +21,8 @@ const uint32 MSG_DESTUSE = 'mDeu'; const uint32 MSG_DESTTEXT = 'mDet'; const uint32 MSG_DESTSELECT = 'mDes'; -#undef TR_CONTEXT -#define TR_CONTEXT "ExpanderPreferences" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ExpanderPreferences" ExpanderPreferences::ExpanderPreferences(BMessage *settings) : BWindow(BRect(0, 0, 325, 305), "Expander", B_MODAL_WINDOW, diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index 78405fcab2..438cba6c44 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 TR_CONTEXT -#define TR_CONTEXT "ExpanderWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ExpanderWindow" ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref, BMessage* settings) @@ -466,8 +466,8 @@ ExpanderWindow::RefsReceived(BMessage* msg) } -#undef TR_CONTEXT -#define TR_CONTEXT "ExpanderMenu" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ExpanderMenu" void ExpanderWindow::_AddMenuBar(BLayout* layout) @@ -507,8 +507,8 @@ ExpanderWindow::_AddMenuBar(BLayout* layout) } -#undef TR_CONTEXT -#define TR_CONTEXT "ExpanderWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ExpanderWindow" void ExpanderWindow::StartExpanding() diff --git a/src/apps/installedpackages/UninstallView.cpp b/src/apps/installedpackages/UninstallView.cpp index 5da9d9db3b..805f3e7ad0 100644 --- a/src/apps/installedpackages/UninstallView.cpp +++ b/src/apps/installedpackages/UninstallView.cpp @@ -34,8 +34,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "UninstallView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "UninstallView" enum { diff --git a/src/apps/installedpackages/UninstallWindow.cpp b/src/apps/installedpackages/UninstallWindow.cpp index 2a281ef2fc..29b44995be 100644 --- a/src/apps/installedpackages/UninstallWindow.cpp +++ b/src/apps/installedpackages/UninstallWindow.cpp @@ -14,8 +14,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "UninstallWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "UninstallWindow" UninstallWindow::UninstallWindow() diff --git a/src/apps/installedpackages/main.cpp b/src/apps/installedpackages/main.cpp index 0a4ee8edaf..222cc92d71 100644 --- a/src/apps/installedpackages/main.cpp +++ b/src/apps/installedpackages/main.cpp @@ -21,8 +21,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "UninstallApplication" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "UninstallApplication" class UninstallApplication : public BApplication { diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp index 1fd85840c8..5439a9035d 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 TR_CONTEXT -#define TR_CONTEXT "InstallerApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "InstallerApp" int main(int, char **) diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 110f5a84dc..2da3ddbb73 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -45,8 +45,8 @@ #include "WorkerThread.h" -#undef TR_CONTEXT -#define TR_CONTEXT "InstallerWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "InstallerWindow" #define DRIVESETUP_SIG "application/x-vnd.Haiku-DriveSetup" #define BOOTMAN_SIG "application/x-vnd.Haiku-Bootman" diff --git a/src/apps/installer/PackageViews.cpp b/src/apps/installer/PackageViews.cpp index e38397aeaa..33249516f3 100644 --- a/src/apps/installer/PackageViews.cpp +++ b/src/apps/installer/PackageViews.cpp @@ -23,8 +23,8 @@ #include "StringForSize.h" -#undef TR_CONTEXT -#define TR_CONTEXT "PackagesView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackagesView" #define ICON_ATTRIBUTE "INSTALLER PACKAGE: ICON" diff --git a/src/apps/installer/ProgressReporter.cpp b/src/apps/installer/ProgressReporter.cpp index 7054e39c00..30dda53281 100644 --- a/src/apps/installer/ProgressReporter.cpp +++ b/src/apps/installer/ProgressReporter.cpp @@ -10,8 +10,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "InstallProgress" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "InstallProgress" ProgressReporter::ProgressReporter(const BMessenger& messenger, diff --git a/src/apps/installer/WorkerThread.cpp b/src/apps/installer/WorkerThread.cpp index c7476d208d..c77f8d6651 100644 --- a/src/apps/installer/WorkerThread.cpp +++ b/src/apps/installer/WorkerThread.cpp @@ -33,7 +33,7 @@ #include "UnzipEngine.h" -#define TR_CONTEXT "InstallProgress" +#define B_TRANSLATE_CONTEXT "InstallProgress" //#define COPY_TRACE diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp index 9ed3e5ef83..ad3e2ece10 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_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 09b26830b4..fa272555fd 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" static const float kPlainFontSizeScale = 0.9; diff --git a/src/apps/mail/FindWindow.cpp b/src/apps/mail/FindWindow.cpp index 707d85abf6..ad5eac18b9 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" enum { diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp index 5e7c7bb527..5f594c3724 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" using namespace BPrivate; diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp index a754cb660d..eaf31ec4af 100644 --- a/src/apps/mail/MailApp.cpp +++ b/src/apps/mail/MailApp.cpp @@ -87,7 +87,7 @@ using namespace BPrivate ; #include "Words.h" -#define TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" static const char *kDictDirectory = "word_dictionary"; diff --git a/src/apps/mail/MailPopUpMenu.cpp b/src/apps/mail/MailPopUpMenu.cpp index b2d74f8a79..e549156729 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_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 2b63f6c326..776240cdc0 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -85,7 +85,7 @@ of their respective holders. All rights reserved. #include "Utilities.h" -#define TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" using namespace BPrivate; diff --git a/src/apps/mail/Prefs.cpp b/src/apps/mail/Prefs.cpp index a45b386bed..63f6217f67 100644 --- a/src/apps/mail/Prefs.cpp +++ b/src/apps/mail/Prefs.cpp @@ -62,7 +62,7 @@ using namespace BPrivate; #include "Signature.h" -#define TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" #define BUTTON_WIDTH 70 #define BUTTON_HEIGHT 20 diff --git a/src/apps/mail/Settings.cpp b/src/apps/mail/Settings.cpp index 7253a03619..b2c3aea007 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 TR_CONTEXT "Settings" +#define B_TRANSLATE_CONTEXT "Settings" using namespace BPrivate ; diff --git a/src/apps/mail/Signature.cpp b/src/apps/mail/Signature.cpp index b9cdcdc02e..f5037715a3 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 TR_CONTEXT "Mail" +#define B_TRANSLATE_CONTEXT "Mail" extern BRect signature_window; diff --git a/src/apps/midiplayer/MidiPlayerApp.cpp b/src/apps/midiplayer/MidiPlayerApp.cpp index 8695bdf873..fe409d627f 100644 --- a/src/apps/midiplayer/MidiPlayerApp.cpp +++ b/src/apps/midiplayer/MidiPlayerApp.cpp @@ -28,8 +28,8 @@ #include "MidiPlayerApp.h" #include "MidiPlayerWindow.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Main Application" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Main Application" MidiPlayerApp::MidiPlayerApp() : BApplication(MIDI_PLAYER_SIGNATURE) diff --git a/src/apps/midiplayer/MidiPlayerWindow.cpp b/src/apps/midiplayer/MidiPlayerWindow.cpp index 2693c73fb8..6769aa63cf 100644 --- a/src/apps/midiplayer/MidiPlayerWindow.cpp +++ b/src/apps/midiplayer/MidiPlayerWindow.cpp @@ -38,8 +38,8 @@ #define _W(a) (a->Frame().Width()) #define _H(a) (a->Frame().Height()) -#undef TR_CONTEXT -#define TR_CONTEXT "Main Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Main Window" //------------------------------------------------------------------------------ diff --git a/src/apps/midiplayer/ScopeView.cpp b/src/apps/midiplayer/ScopeView.cpp index 3339ef989d..4f68e9c083 100644 --- a/src/apps/midiplayer/ScopeView.cpp +++ b/src/apps/midiplayer/ScopeView.cpp @@ -27,8 +27,8 @@ #include "ScopeView.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Scope View" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Scope View" //------------------------------------------------------------------------------ diff --git a/src/apps/packageinstaller/PackageImageViewer.cpp b/src/apps/packageinstaller/PackageImageViewer.cpp index 77ea313063..9dd73f8ff6 100644 --- a/src/apps/packageinstaller/PackageImageViewer.cpp +++ b/src/apps/packageinstaller/PackageImageViewer.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PackageImageViewer" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageImageViewer" enum { P_MSG_CLOSE = 'pmic' diff --git a/src/apps/packageinstaller/PackageInfo.cpp b/src/apps/packageinstaller/PackageInfo.cpp index 24d232196c..9d6b118081 100644 --- a/src/apps/packageinstaller/PackageInfo.cpp +++ b/src/apps/packageinstaller/PackageInfo.cpp @@ -18,8 +18,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PackageInfo" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageInfo" #define RETURN_AND_SET_STATUS(err) fStatus = err; \ fprintf(stderr, "err at %s():%d: %x\n", __FUNCTION__, __LINE__, err); \ diff --git a/src/apps/packageinstaller/PackageInstall.cpp b/src/apps/packageinstaller/PackageInstall.cpp index 797b4b2076..78a261b290 100644 --- a/src/apps/packageinstaller/PackageInstall.cpp +++ b/src/apps/packageinstaller/PackageInstall.cpp @@ -19,8 +19,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PackageInstall" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageInstall" static int32 diff --git a/src/apps/packageinstaller/PackageItem.cpp b/src/apps/packageinstaller/PackageItem.cpp index 90fd988e35..827780d639 100644 --- a/src/apps/packageinstaller/PackageItem.cpp +++ b/src/apps/packageinstaller/PackageItem.cpp @@ -25,8 +25,8 @@ #include "zlib.h" -#undef TR_CONTEXT -#define TR_CONTEXT "PackageItem" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageItem" enum { P_CHUNK_SIZE = 256 @@ -497,7 +497,7 @@ PackageItem::ParseData(uint8 *buffer, BFile *file, uint64 originalSize, // #pragma mark - PackageScript -PackageScript::PackageScript(BFile *parent, uint64 offset, uint64 size, +PackageScript::PackageScript(BFile *parent, uint64 offset, uint64 size, uint64 originalSize) : PackageItem(parent, NULL, 0, 0, 0, offset, size), @@ -563,7 +563,7 @@ PackageScript::DoInstall(const char *path, ItemState *state) } -const uint32 +const uint32 PackageScript::ItemKind() { return P_KIND_SCRIPT; @@ -739,7 +739,7 @@ PackageDirectory::DoInstall(const char *path, ItemState *state) } -const uint32 +const uint32 PackageDirectory::ItemKind() { return P_KIND_DIRECTORY; @@ -905,7 +905,7 @@ PackageFile::DoInstall(const char *path, ItemState *state) } -const uint32 +const uint32 PackageFile::ItemKind() { return P_KIND_FILE; @@ -1040,7 +1040,7 @@ PackageLink::DoInstall(const char *path, ItemState *state) } -const uint32 +const uint32 PackageLink::ItemKind() { return P_KIND_SYM_LINK; diff --git a/src/apps/packageinstaller/PackageStatus.cpp b/src/apps/packageinstaller/PackageStatus.cpp index 394351bd50..44e1f75534 100644 --- a/src/apps/packageinstaller/PackageStatus.cpp +++ b/src/apps/packageinstaller/PackageStatus.cpp @@ -18,8 +18,8 @@ #include #include -#undef TR_CONTEXT -#define TR_CONTEXT "PackageStatus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageStatus" StopButton::StopButton() : diff --git a/src/apps/packageinstaller/PackageTextViewer.cpp b/src/apps/packageinstaller/PackageTextViewer.cpp index 25d4c1d3af..89d970136c 100644 --- a/src/apps/packageinstaller/PackageTextViewer.cpp +++ b/src/apps/packageinstaller/PackageTextViewer.cpp @@ -23,8 +23,8 @@ enum { P_MSG_DECLINE }; -#undef TR_CONTEXT -#define TR_CONTEXT "PackageTextViewer" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageTextViewer" PackageTextViewer::PackageTextViewer(const char *text, bool disclaimer) diff --git a/src/apps/packageinstaller/PackageView.cpp b/src/apps/packageinstaller/PackageView.cpp index 1b279171b2..fce87de60d 100644 --- a/src/apps/packageinstaller/PackageView.cpp +++ b/src/apps/packageinstaller/PackageView.cpp @@ -35,8 +35,8 @@ #include // For debugging -#undef TR_CONTEXT -#define TR_CONTEXT "PackageView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageView" const float kMaxDescHeight = 125.0f; const uint32 kSeparatorIndex = 3; diff --git a/src/apps/packageinstaller/PackageWindow.cpp b/src/apps/packageinstaller/PackageWindow.cpp index 6ddbae3a69..afcddf03ee 100644 --- a/src/apps/packageinstaller/PackageWindow.cpp +++ b/src/apps/packageinstaller/PackageWindow.cpp @@ -15,8 +15,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PackageWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PackageWindow" PackageWindow::PackageWindow(const entry_ref *ref) diff --git a/src/apps/packageinstaller/main.cpp b/src/apps/packageinstaller/main.cpp index 3a908858e2..db784b31d0 100644 --- a/src/apps/packageinstaller/main.cpp +++ b/src/apps/packageinstaller/main.cpp @@ -21,8 +21,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Packageinstaller main" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Packageinstaller main" class PackageInstaller : public BApplication { public: diff --git a/src/apps/pairs/PairsView.cpp b/src/apps/pairs/PairsView.cpp index 4dfd32e97b..6cee5dae66 100644 --- a/src/apps/pairs/PairsView.cpp +++ b/src/apps/pairs/PairsView.cpp @@ -93,8 +93,8 @@ PairsView::_HasBitmap(BList& bitmaps, BBitmap* bitmap) return false; } -#undef TR_CONTEXT -#define TR_CONTEXT "PairsView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PairsView" void PairsView::_ReadRandomIcons() diff --git a/src/apps/pairs/PairsWindow.cpp b/src/apps/pairs/PairsWindow.cpp index 6dd1d9aa16..135717e019 100644 --- a/src/apps/pairs/PairsWindow.cpp +++ b/src/apps/pairs/PairsWindow.cpp @@ -29,8 +29,8 @@ // #pragma mark - PairsWindow -#undef TR_CONTEXT -#define TR_CONTEXT "PairsWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PairsWindow" const uint32 MENU_NEW = 'MGnw'; const uint32 MENU_SIZE = 'MGsz'; diff --git a/src/apps/readonlybootprompt/BootPromptWindow.cpp b/src/apps/readonlybootprompt/BootPromptWindow.cpp index 0f3d51478d..ba6fefbc14 100644 --- a/src/apps/readonlybootprompt/BootPromptWindow.cpp +++ b/src/apps/readonlybootprompt/BootPromptWindow.cpp @@ -37,8 +37,8 @@ enum { MSG_KEYMAP_SELECTED = 'kmps' }; -#undef TR_CONTEXT -#define TR_CONTEXT "BootPromptWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "BootPromptWindow" class LanguageItem : public BStringItem { diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp index 9765a110f2..ec6e7726ee 100644 --- a/src/apps/screenshot/ScreenshotWindow.cpp +++ b/src/apps/screenshot/ScreenshotWindow.cpp @@ -93,8 +93,8 @@ public: // #pragma mark - ScreenshotWindow -#undef TR_CONTEXT -#define TR_CONTEXT "ScreenshotWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ScreenshotWindow" ScreenshotWindow::ScreenshotWindow() diff --git a/src/apps/showimage/PrintOptionsWindow.cpp b/src/apps/showimage/PrintOptionsWindow.cpp index 566d0b442a..154b3e6a3c 100644 --- a/src/apps/showimage/PrintOptionsWindow.cpp +++ b/src/apps/showimage/PrintOptionsWindow.cpp @@ -74,8 +74,8 @@ PrintOptions::SetHeight(float h) } -#undef TR_CONTEXT -#define TR_CONTEXT "PrintOptionsWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PrintOptionsWindow" PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions* options, BWindow* listener) diff --git a/src/apps/showimage/ProgressWindow.cpp b/src/apps/showimage/ProgressWindow.cpp index 6529ae2212..9fb577c889 100644 --- a/src/apps/showimage/ProgressWindow.cpp +++ b/src/apps/showimage/ProgressWindow.cpp @@ -20,8 +20,8 @@ static const uint32 kMsgShow = 'show'; -#undef TR_CONTEXT -#define TR_CONTEXT "ProgressWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ProgressWindow" ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center) diff --git a/src/apps/showimage/ResizerWindow.cpp b/src/apps/showimage/ResizerWindow.cpp index 663c246d17..ee81f341f5 100644 --- a/src/apps/showimage/ResizerWindow.cpp +++ b/src/apps/showimage/ResizerWindow.cpp @@ -32,8 +32,8 @@ #include "ShowImageConstants.h" -#undef TR_CONTEXT -#define TR_CONTEXT "ResizerWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ResizerWindow" ResizerWindow::ResizerWindow(BMessenger target, int32 width, int32 height) : diff --git a/src/apps/showimage/ShowImageApp.cpp b/src/apps/showimage/ShowImageApp.cpp index 4129d98c45..ac850c48c1 100644 --- a/src/apps/showimage/ShowImageApp.cpp +++ b/src/apps/showimage/ShowImageApp.cpp @@ -47,8 +47,8 @@ ShowImageApp::~ShowImageApp() } -#undef TR_CONTEXT -#define TR_CONTEXT "AboutWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "AboutWindow" void ShowImageApp::AboutRequested() diff --git a/src/apps/showimage/ShowImageView.cpp b/src/apps/showimage/ShowImageView.cpp index 4b4acd7835..4167f91233 100644 --- a/src/apps/showimage/ShowImageView.cpp +++ b/src/apps/showimage/ShowImageView.cpp @@ -1248,8 +1248,8 @@ ShowImageView::_OutputFormatForType(BBitmap* bitmap, const char* type, } -#undef TR_CONTEXT -#define TR_CONTEXT "SaveToFile" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "SaveToFile" void diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index 819287d94c..38532a1532 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -183,8 +183,8 @@ ShowImageWindow::ShowImageWindow(const entry_ref* ref, fImageView->SetImage(ref); fImageView->SetTrackerMessenger(trackerMessenger); -#undef TR_CONTEXT -#define TR_CONTEXT "LoadAlerts" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "LoadAlerts" if (InitCheck() != B_OK) { BAlert* alert; @@ -200,8 +200,8 @@ ShowImageWindow::ShowImageWindow(const entry_ref* ref, return; } -#undef TR_CONTEXT -#define TR_CONTEXT "Menus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" // add View menu here so it can access ShowImageView methods BMenu* menu = new BMenu(B_TRANSLATE("View")); @@ -255,8 +255,8 @@ ShowImageWindow::BuildContextMenu(BMenu* menu) } -#undef TR_CONTEXT -#define TR_CONTEXT "Menus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" void ShowImageWindow::_BuildViewMenu(BMenu* menu, bool popupMenu) @@ -1016,8 +1016,8 @@ bs_printf(BString* string, const char* format, ...) } -#undef TR_CONTEXT -#define TR_CONTEXT "ClosePrompt" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ClosePrompt" bool ShowImageWindow::_ClosePrompt() diff --git a/src/apps/stylededit/FindWindow.cpp b/src/apps/stylededit/FindWindow.cpp index 7e29171d51..f087a324b0 100644 --- a/src/apps/stylededit/FindWindow.cpp +++ b/src/apps/stylededit/FindWindow.cpp @@ -22,8 +22,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FindandReplaceWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "FindandReplaceWindow" FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString, bool caseState, bool wrapState, bool backState) diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp index 89714a20c9..737a3a4226 100644 --- a/src/apps/stylededit/ReplaceWindow.cpp +++ b/src/apps/stylededit/ReplaceWindow.cpp @@ -25,8 +25,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FindandReplaceWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "FindandReplaceWindow" ReplaceWindow::ReplaceWindow(BRect frame, BHandler* _handler, BString* searchString, BString *replaceString, diff --git a/src/apps/stylededit/StyledEditApp.cpp b/src/apps/stylededit/StyledEditApp.cpp index b0073dc887..d78ee376cb 100644 --- a/src/apps/stylededit/StyledEditApp.cpp +++ b/src/apps/stylededit/StyledEditApp.cpp @@ -80,8 +80,8 @@ namespace // #pragma mark - -#undef TR_CONTEXT -#define TR_CONTEXT "Open_and_SaveAsPanel" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel" StyledEditApp::StyledEditApp() : BApplication(APP_SIGNATURE), diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index 810479d3bd..ddbcd950b6 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -50,8 +50,8 @@ const float kLineViewWidth = 30.0; const char* kInfoAttributeName = "StyledEdit-info"; -#undef TR_CONTEXT -#define TR_CONTEXT "StyledEditWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "StyledEditWindow" // This is a temporary solution for building BString with printf like format. @@ -102,8 +102,8 @@ StyledEditWindow::~StyledEditWindow() } -#undef TR_CONTEXT -#define TR_CONTEXT "Menus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" void @@ -866,8 +866,8 @@ StyledEditWindow::Quit() } -#undef TR_CONTEXT -#define TR_CONTEXT "QuitAlert" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "QuitAlert" bool @@ -898,8 +898,8 @@ StyledEditWindow::QuitRequested() } -#undef TR_CONTEXT -#define TR_CONTEXT "SaveAlert" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "SaveAlert" status_t @@ -979,8 +979,8 @@ StyledEditWindow::Save(BMessage* message) } -#undef TR_CONTEXT -#define TR_CONTEXT "Open_and_SaveAsPanel" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Open_and_SaveAsPanel" status_t @@ -1033,8 +1033,8 @@ StyledEditWindow::SaveAs(BMessage* message) } -#undef TR_CONTEXT -#define TR_CONTEXT "LoadAlert" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "LoadAlert" status_t @@ -1128,8 +1128,8 @@ StyledEditWindow::OpenFile(entry_ref* ref) } -#undef TR_CONTEXT -#define TR_CONTEXT "RevertToSavedAlert" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "RevertToSavedAlert" void @@ -1169,8 +1169,8 @@ StyledEditWindow::RevertToSaved() if (_LoadFile(&ref) != B_OK) return; -#undef TR_CONTEXT -#define TR_CONTEXT "Menus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" // clear undo modes fUndoItem->SetLabel(B_TRANSLATE("Can't undo")); @@ -1497,8 +1497,8 @@ StyledEditWindow::SetFontStyle(const char* fontFamily, const char* fontStyle) } -#undef TR_CONTEXT -#define TR_CONTEXT "Menus" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" void diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp index 7d2cc0e34a..1f548af70f 100644 --- a/src/apps/terminal/AppearPrefView.cpp +++ b/src/apps/terminal/AppearPrefView.cpp @@ -29,8 +29,8 @@ #include "TermConst.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal AppearancePrefView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal AppearancePrefView" static bool diff --git a/src/apps/terminal/Arguments.cpp b/src/apps/terminal/Arguments.cpp index b633be52b6..f2fda27403 100644 --- a/src/apps/terminal/Arguments.cpp +++ b/src/apps/terminal/Arguments.cpp @@ -14,8 +14,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal arguments parsing" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal arguments parsing" Arguments::Arguments(int defaultArgsNum, const char * const *defaultArgs) diff --git a/src/apps/terminal/FindWindow.cpp b/src/apps/terminal/FindWindow.cpp index 30f4827c32..ce63f01cbd 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 TR_CONTEXT -#define TR_CONTEXT "Terminal FindWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal FindWindow" FindWindow::FindWindow(BMessenger messenger, const BString& str, bool findSelection, bool matchWord, bool matchCase, bool forwardSearch) diff --git a/src/apps/terminal/PrefHandler.cpp b/src/apps/terminal/PrefHandler.cpp index 55d7071dba..1d3906a4e8 100644 --- a/src/apps/terminal/PrefHandler.cpp +++ b/src/apps/terminal/PrefHandler.cpp @@ -241,8 +241,8 @@ PrefHandler::getFloat(const char *key) return atof(value); } -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal getString" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal getString" const char* PrefHandler::getString(const char *key) @@ -267,8 +267,8 @@ PrefHandler::getBool(const char *key) } -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal getRGB" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal getRGB" /** Returns RGB data from given key. */ diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp index 1b5fa435fd..fa19d09270 100644 --- a/src/apps/terminal/PrefWindow.cpp +++ b/src/apps/terminal/PrefWindow.cpp @@ -23,8 +23,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal PrefWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal PrefWindow" PrefWindow::PrefWindow(const BMessenger &messenger) : BWindow(BRect(0, 0, 375, 185), B_TRANSLATE("Terminal settings"), diff --git a/src/apps/terminal/Shell.cpp b/src/apps/terminal/Shell.cpp index fbfb553533..2577b4501c 100644 --- a/src/apps/terminal/Shell.cpp +++ b/src/apps/terminal/Shell.cpp @@ -318,8 +318,8 @@ initialize_termios(struct termios &tio) tio.c_cc[VSUSP] = CSUSP; /* '^Z' */ } -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal Shell" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal Shell" status_t Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **argv) diff --git a/src/apps/terminal/SmartTabView.cpp b/src/apps/terminal/SmartTabView.cpp index b68f1e5aa9..d1675fa3c3 100644 --- a/src/apps/terminal/SmartTabView.cpp +++ b/src/apps/terminal/SmartTabView.cpp @@ -62,8 +62,8 @@ SmartTabView::SetInsets(float left, float top, float right, float bottom) fInsets.bottom = bottom; } -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal SmartTabView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal SmartTabView" void SmartTabView::MouseDown(BPoint point) diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp index 90a153ca47..cad2590bfb 100644 --- a/src/apps/terminal/TermApp.cpp +++ b/src/apps/terminal/TermApp.cpp @@ -53,8 +53,8 @@ main() return 0; } -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal TermApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal TermApp" TermApp::TermApp() : BApplication(TERM_SIGNATURE), diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index f78677412f..7ac083b271 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -83,8 +83,8 @@ enum { SELECT_LINES }; -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal TermView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal TermView" static property_info sPropList[] = { { "encoding", diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index a3a5d3c7eb..7911d3e9b1 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -54,8 +54,8 @@ const static uint32 kIncreaseFontSize = 'InFs'; const static uint32 kDecreaseFontSize = 'DcFs'; const static uint32 kSetActiveTab = 'STab'; -#undef TR_CONTEXT -#define TR_CONTEXT "Terminal TermWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Terminal TermWindow" class CustomTermView : public TermView { public: diff --git a/src/kits/interface/ColorControl.cpp b/src/kits/interface/ColorControl.cpp index 844808a1e7..7cee44a86c 100644 --- a/src/kits/interface/ColorControl.cpp +++ b/src/kits/interface/ColorControl.cpp @@ -33,8 +33,8 @@ using BPrivate::LocaleBackend; #include -#undef TR_CONTEXT -#define TR_CONTEXT "ColorControl" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ColorControl" static const uint32 kMsgColorEntered = 'ccol'; static const uint32 kMinCellSize = 6; diff --git a/src/preferences/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp index f01b3cbe51..847859b0bf 100644 --- a/src/preferences/appearance/APRView.cpp +++ b/src/preferences/appearance/APRView.cpp @@ -29,8 +29,8 @@ #include "ColorSet.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Colors tab" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Colors tab" #define COLOR_DROPPED 'cldp' #define DECORATOR_CHANGED 'dcch' diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp index 227cab910c..3858207842 100644 --- a/src/preferences/appearance/APRWindow.cpp +++ b/src/preferences/appearance/APRWindow.cpp @@ -18,8 +18,8 @@ #include "APRView.h" #include "defs.h" -#undef TR_CONTEXT -#define TR_CONTEXT "APRWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "APRWindow" static const uint32 kMsgSetDefaults = 'dflt'; static const uint32 kMsgRevert = 'rvrt'; diff --git a/src/preferences/appearance/AntialiasingSettingsView.cpp b/src/preferences/appearance/AntialiasingSettingsView.cpp index de01ac2395..c604c7d329 100644 --- a/src/preferences/appearance/AntialiasingSettingsView.cpp +++ b/src/preferences/appearance/AntialiasingSettingsView.cpp @@ -27,8 +27,8 @@ #include "APRWindow.h" -#undef TR_CONTEXT -#define TR_CONTEXT "AntialiasingSettingsView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "AntialiasingSettingsView" //#define DISABLE_HINTING_CONTROL diff --git a/src/preferences/appearance/ColorSet.cpp b/src/preferences/appearance/ColorSet.cpp index 8c2de1a624..653eba5fd5 100644 --- a/src/preferences/appearance/ColorSet.cpp +++ b/src/preferences/appearance/ColorSet.cpp @@ -19,8 +19,8 @@ #include #include "ColorSet.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Colors tab" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Colors tab" static ColorDescription sColorDescriptionTable[] = { diff --git a/src/preferences/backgrounds/Backgrounds.cpp b/src/preferences/backgrounds/Backgrounds.cpp index 2ce8e2cb52..8f13bc64d6 100644 --- a/src/preferences/backgrounds/Backgrounds.cpp +++ b/src/preferences/backgrounds/Backgrounds.cpp @@ -18,7 +18,7 @@ #include "BackgroundsView.h" -#define TR_CONTEXT "Main Window" +#define B_TRANSLATE_CONTEXT "Main Window" static const char* kSignature = "application/x-vnd.Haiku-Backgrounds"; diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp index 05cd5edcaf..4c7acf3441 100644 --- a/src/preferences/backgrounds/BackgroundsView.cpp +++ b/src/preferences/backgrounds/BackgroundsView.cpp @@ -32,7 +32,7 @@ #include "ImageFilePanel.h" -#define TR_CONTEXT "Main View" +#define B_TRANSLATE_CONTEXT "Main View" static const uint32 kMsgApplySettings = 'aply'; diff --git a/src/preferences/backgrounds/ImageFilePanel.cpp b/src/preferences/backgrounds/ImageFilePanel.cpp index 22e24aafd3..00859034aa 100644 --- a/src/preferences/backgrounds/ImageFilePanel.cpp +++ b/src/preferences/backgrounds/ImageFilePanel.cpp @@ -19,7 +19,7 @@ #include -#define TR_CONTEXT "Image Filepanel" +#define B_TRANSLATE_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 e99e32ff9f..5ff9d47a23 100644 --- a/src/preferences/bluetooth/BluetoothDeviceView.cpp +++ b/src/preferences/bluetooth/BluetoothDeviceView.cpp @@ -18,7 +18,7 @@ #include -#define TR_CONTEXT "Device View" +#define B_TRANSLATE_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 7e5b7d17ac..e7d91b89c9 100644 --- a/src/preferences/bluetooth/BluetoothMain.cpp +++ b/src/preferences/bluetooth/BluetoothMain.cpp @@ -15,7 +15,7 @@ #include "defs.h" -#define TR_CONTEXT "main" +#define B_TRANSLATE_CONTEXT "main" BluetoothApplication::BluetoothApplication(void) : BApplication(BLUETOOTH_APP_SIGNATURE) diff --git a/src/preferences/bluetooth/BluetoothSettingsView.cpp b/src/preferences/bluetooth/BluetoothSettingsView.cpp index 7a2e4a87c6..ad61393c32 100644 --- a/src/preferences/bluetooth/BluetoothSettingsView.cpp +++ b/src/preferences/bluetooth/BluetoothSettingsView.cpp @@ -26,7 +26,7 @@ #include "defs.h" #include "BluetoothWindow.h" -#define TR_CONTEXT "Settings view" +#define B_TRANSLATE_CONTEXT "Settings view" static const int32 kMsgSetAntialiasing = 'anti'; static const int32 kMsgSetDeviceClassDesktop = 'sDCd'; diff --git a/src/preferences/bluetooth/BluetoothWindow.cpp b/src/preferences/bluetooth/BluetoothWindow.cpp index a7526eecb9..bfd2790d04 100644 --- a/src/preferences/bluetooth/BluetoothWindow.cpp +++ b/src/preferences/bluetooth/BluetoothWindow.cpp @@ -20,7 +20,7 @@ #include "defs.h" -#define TR_CONTEXT "Window" +#define B_TRANSLATE_CONTEXT "Window" static const uint32 kMsgSetDefaults = 'dflt'; static const uint32 kMsgRevert = 'rvrt'; diff --git a/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp b/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp index 66d78a89ab..db38ba92c6 100644 --- a/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp +++ b/src/preferences/bluetooth/ExtendedLocalDeviceView.cpp @@ -16,7 +16,7 @@ #include #include -#define TR_CONTEXT "Extended local device view" +#define B_TRANSLATE_CONTEXT "Extended local device view" ExtendedLocalDeviceView::ExtendedLocalDeviceView(BRect frame, LocalDevice* bDevice, uint32 resizingMode, uint32 flags) diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp index 70ad40d548..e01c2dc0e0 100644 --- a/src/preferences/bluetooth/InquiryPanel.cpp +++ b/src/preferences/bluetooth/InquiryPanel.cpp @@ -26,7 +26,7 @@ #include "DeviceListItem.h" #include "InquiryPanel.h" -#define TR_CONTEXT "Inquiry panel" +#define B_TRANSLATE_CONTEXT "Inquiry panel" using Bluetooth::DeviceListItem; diff --git a/src/preferences/bluetooth/RemoteDevicesView.cpp b/src/preferences/bluetooth/RemoteDevicesView.cpp index 0113cff034..e4fd13862c 100644 --- a/src/preferences/bluetooth/RemoteDevicesView.cpp +++ b/src/preferences/bluetooth/RemoteDevicesView.cpp @@ -26,7 +26,7 @@ #include "InquiryPanel.h" #include "RemoteDevicesView.h" -#define TR_CONTEXT "Remote devices" +#define B_TRANSLATE_CONTEXT "Remote devices" static const uint32 kMsgAddDevices = 'ddDv'; static const uint32 kMsgRemoveDevice = 'rmDv'; diff --git a/src/preferences/cpufrequency/CPUFrequencyView.cpp b/src/preferences/cpufrequency/CPUFrequencyView.cpp index c111d61fed..5f759d2dc3 100644 --- a/src/preferences/cpufrequency/CPUFrequencyView.cpp +++ b/src/preferences/cpufrequency/CPUFrequencyView.cpp @@ -18,7 +18,7 @@ #include #include -#define TR_CONTEXT "CPU Frequency View" +#define B_TRANSLATE_CONTEXT "CPU Frequency View" const char* kCPUFreqPreferencesFile = "CPUFrequency"; const char* kPrefSignature = "application/x-vnd.Haiku-CPUFrequencyPref"; diff --git a/src/preferences/cpufrequency/ColorStepView.cpp b/src/preferences/cpufrequency/ColorStepView.cpp index dd25754dda..40fcdcfbb0 100644 --- a/src/preferences/cpufrequency/ColorStepView.cpp +++ b/src/preferences/cpufrequency/ColorStepView.cpp @@ -15,7 +15,7 @@ #include -#define TR_CONTEXT "Color Step View" +#define B_TRANSLATE_CONTEXT "Color Step View" const int32 kColorBarHeight = 15; diff --git a/src/preferences/cpufrequency/PreferencesWindow.h b/src/preferences/cpufrequency/PreferencesWindow.h index 89a0d57015..cd1d15aa89 100644 --- a/src/preferences/cpufrequency/PreferencesWindow.h +++ b/src/preferences/cpufrequency/PreferencesWindow.h @@ -34,7 +34,7 @@ #endif -#define TR_CONTEXT "Pref Window" +#define B_TRANSLATE_CONTEXT "Pref Window" // messages PrefFileWatcher const uint32 kUpdatedPreferences = '&UdP'; @@ -441,6 +441,6 @@ PreferencesWindow::_MoveToPosition() MoveTo(position); } -#undef TR_CONTEXT +#undef B_TRANSLATE_CONTEXT #endif // PREFERENCES_WINDOW_h diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp index 0278d55d88..85c3d7dd4e 100644 --- a/src/preferences/cpufrequency/StatusView.cpp +++ b/src/preferences/cpufrequency/StatusView.cpp @@ -29,7 +29,7 @@ extern "C" _EXPORT BView *instantiate_deskbar_item(void); -#define TR_CONTEXT "Status view" +#define B_TRANSLATE_CONTEXT "Status view" #define MAX_FREQ_STRING "9999MHz" @@ -218,20 +218,20 @@ FrequencyMenu::FrequencyMenu(BMenu* menu, BHandler* target, { BCatalog catalog("x-vnd.Haiku-CPUFrequencyPref"); fDynamicPerformance = new BMenuItem( - catalog.GetString("Dynamic performance", TR_CONTEXT), + catalog.GetString("Dynamic performance", B_TRANSLATE_CONTEXT), new BMessage(kMsgPolicyDynamic)); fHighPerformance = new BMenuItem( - catalog.GetString("High performance", TR_CONTEXT), + catalog.GetString("High performance", B_TRANSLATE_CONTEXT), new BMessage(kMsgPolicyPerformance)); fLowEnergie = new BMenuItem(catalog.GetString("Low energy", - TR_CONTEXT), new BMessage(kMsgPolicyLowEnergy)); + B_TRANSLATE_CONTEXT), new BMessage(kMsgPolicyLowEnergy)); menu->AddItem(fDynamicPerformance); menu->AddItem(fHighPerformance); menu->AddItem(fLowEnergie); fCustomStateMenu = new BMenu(catalog.GetString("Set state", - TR_CONTEXT)); + B_TRANSLATE_CONTEXT)); StateList* stateList = fInterface->GetCpuFrequencyStates(); for (int i = 0; i < stateList->CountItems(); i++) { @@ -432,8 +432,8 @@ StatusView::_AboutRequested() { BAlert *alert = new BAlert("about", fCatalog.GetString("CPUFrequency\n" "\twritten by Clemens Zeidler\n" - "\tCopyright 2009, Haiku, Inc.\n", TR_CONTEXT), - fCatalog.GetString("Ok", TR_CONTEXT)); + "\tCopyright 2009, Haiku, Inc.\n", B_TRANSLATE_CONTEXT), + fCatalog.GetString("Ok", B_TRANSLATE_CONTEXT)); BTextView *view = alert->TextView(); BFont font; @@ -514,14 +514,14 @@ StatusView::AttachedToWindow() fPreferencesMenu->AddSeparatorItem(); fOpenPrefItem = new BMenuItem(fCatalog.GetString( - "Open Speedstep preferences" B_UTF8_ELLIPSIS, TR_CONTEXT), + "Open Speedstep preferences" B_UTF8_ELLIPSIS, B_TRANSLATE_CONTEXT), new BMessage(kMsgOpenSSPreferences)); fPreferencesMenu->AddItem(fOpenPrefItem); fOpenPrefItem->SetTarget(this); if (fInDeskbar) { fQuitItem= new BMenuItem(fCatalog.GetString("Quit", - TR_CONTEXT), new BMessage(B_QUIT_REQUESTED)); + B_TRANSLATE_CONTEXT), new BMessage(B_QUIT_REQUESTED)); fPreferencesMenu->AddItem(fQuitItem); fQuitItem->SetTarget(this); } diff --git a/src/preferences/cpufrequency/main.cpp b/src/preferences/cpufrequency/main.cpp index b2680055d5..bebceeb3a1 100644 --- a/src/preferences/cpufrequency/main.cpp +++ b/src/preferences/cpufrequency/main.cpp @@ -12,7 +12,7 @@ #include #include -#define TR_CONTEXT "Main window" +#define B_TRANSLATE_CONTEXT "Main window" int main(int argc, char* argv[]) diff --git a/src/preferences/filetypes/ApplicationTypeWindow.cpp b/src/preferences/filetypes/ApplicationTypeWindow.cpp index 3382e04153..0afb8fcad8 100644 --- a/src/preferences/filetypes/ApplicationTypeWindow.cpp +++ b/src/preferences/filetypes/ApplicationTypeWindow.cpp @@ -43,8 +43,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Application Type Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Application Type Window" const uint32 kMsgSave = 'save'; diff --git a/src/preferences/filetypes/ApplicationTypesWindow.cpp b/src/preferences/filetypes/ApplicationTypesWindow.cpp index bf4dd2412a..4c9823adbd 100644 --- a/src/preferences/filetypes/ApplicationTypesWindow.cpp +++ b/src/preferences/filetypes/ApplicationTypesWindow.cpp @@ -40,8 +40,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Application Types Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Application Types Window" class ProgressWindow : public BWindow { diff --git a/src/preferences/filetypes/AttributeWindow.cpp b/src/preferences/filetypes/AttributeWindow.cpp index e341bbe2ff..005cdf75ab 100644 --- a/src/preferences/filetypes/AttributeWindow.cpp +++ b/src/preferences/filetypes/AttributeWindow.cpp @@ -30,8 +30,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Attribute Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Attribute Window" const uint32 kMsgAttributeUpdated = 'atup'; diff --git a/src/preferences/filetypes/ExtensionWindow.cpp b/src/preferences/filetypes/ExtensionWindow.cpp index 996012c0c0..dc04d17186 100644 --- a/src/preferences/filetypes/ExtensionWindow.cpp +++ b/src/preferences/filetypes/ExtensionWindow.cpp @@ -24,8 +24,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Extension Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Extension Window" const uint32 kMsgExtensionUpdated = 'exup'; diff --git a/src/preferences/filetypes/FileTypeWindow.cpp b/src/preferences/filetypes/FileTypeWindow.cpp index 21ec5d5225..3faf2143f9 100644 --- a/src/preferences/filetypes/FileTypeWindow.cpp +++ b/src/preferences/filetypes/FileTypeWindow.cpp @@ -31,8 +31,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FileType Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "FileType Window" const uint32 kMsgTypeEntered = 'type'; diff --git a/src/preferences/filetypes/FileTypes.cpp b/src/preferences/filetypes/FileTypes.cpp index 432426cde8..b9f6eb36e0 100644 --- a/src/preferences/filetypes/FileTypes.cpp +++ b/src/preferences/filetypes/FileTypes.cpp @@ -26,8 +26,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FileTypes" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_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 67180d4f0a..133289fdba 100644 --- a/src/preferences/filetypes/FileTypesWindow.cpp +++ b/src/preferences/filetypes/FileTypesWindow.cpp @@ -47,8 +47,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "FileTypes Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "FileTypes Window" const uint32 kMsgTypeSelected = 'typs'; diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp index b5ac5c5e90..b07b60c9bc 100644 --- a/src/preferences/filetypes/IconView.cpp +++ b/src/preferences/filetypes/IconView.cpp @@ -27,8 +27,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Icon View" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Icon View" using namespace std; diff --git a/src/preferences/filetypes/NewFileTypeWindow.cpp b/src/preferences/filetypes/NewFileTypeWindow.cpp index 5325b43ffc..931a5ad916 100644 --- a/src/preferences/filetypes/NewFileTypeWindow.cpp +++ b/src/preferences/filetypes/NewFileTypeWindow.cpp @@ -27,8 +27,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "New File Type Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "New File Type Window" const uint32 kMsgSupertypeChosen = 'sptc'; diff --git a/src/preferences/filetypes/PreferredAppMenu.cpp b/src/preferences/filetypes/PreferredAppMenu.cpp index e2a3d1cc73..efd3ee706d 100644 --- a/src/preferences/filetypes/PreferredAppMenu.cpp +++ b/src/preferences/filetypes/PreferredAppMenu.cpp @@ -21,8 +21,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Preferred App Menu" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Preferred App Menu" static int diff --git a/src/preferences/filetypes/TypeListWindow.cpp b/src/preferences/filetypes/TypeListWindow.cpp index 4392e88e33..008fee7541 100644 --- a/src/preferences/filetypes/TypeListWindow.cpp +++ b/src/preferences/filetypes/TypeListWindow.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Type List Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Type List Window" const uint32 kMsgTypeSelected = 'tpsl'; diff --git a/src/preferences/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp index 1509da8720..3961be754c 100644 --- a/src/preferences/fonts/FontSelectionView.cpp +++ b/src/preferences/fonts/FontSelectionView.cpp @@ -26,8 +26,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Font Selection view" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Font Selection view" #define INSTANT_UPDATE diff --git a/src/preferences/fonts/FontView.cpp b/src/preferences/fonts/FontView.cpp index 5f2a1402bf..4e00462db8 100644 --- a/src/preferences/fonts/FontView.cpp +++ b/src/preferences/fonts/FontView.cpp @@ -20,8 +20,8 @@ #include #include -#undef TR_CONTEXT -#define TR_CONTEXT "Font view" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_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 bfca6e4029..9a54b279ba 100644 --- a/src/preferences/fonts/MainWindow.cpp +++ b/src/preferences/fonts/MainWindow.cpp @@ -30,8 +30,8 @@ #include "FontView.h" -#undef TR_CONTEXT -#define TR_CONTEXT "Main window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Main window" static const uint32 kMsgSetDefaults = 'dflt'; diff --git a/src/preferences/fonts/main.cpp b/src/preferences/fonts/main.cpp index 1bc9810cbc..4c95f8d905 100644 --- a/src/preferences/fonts/main.cpp +++ b/src/preferences/fonts/main.cpp @@ -17,8 +17,8 @@ #include #include -#undef TR_CONTEXT -#define TR_CONTEXT "main" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "main" class FontsApp : public BApplication { public: diff --git a/src/preferences/keyboard/Keyboard.cpp b/src/preferences/keyboard/Keyboard.cpp index 18149448e9..e4fdd784ac 100644 --- a/src/preferences/keyboard/Keyboard.cpp +++ b/src/preferences/keyboard/Keyboard.cpp @@ -15,8 +15,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "KeyboardApplication" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_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 439777b977..454f9ee0c4 100644 --- a/src/preferences/keyboard/KeyboardView.cpp +++ b/src/preferences/keyboard/KeyboardView.cpp @@ -23,8 +23,8 @@ #include "KeyboardMessages.h" #include "KeyboardSettings.h" -#undef TR_CONTEXT -#define TR_CONTEXT "KeyboardView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "KeyboardView" KeyboardView::KeyboardView() : BGroupView() diff --git a/src/preferences/keyboard/KeyboardWindow.cpp b/src/preferences/keyboard/KeyboardWindow.cpp index 68aa73d47f..b732a93099 100644 --- a/src/preferences/keyboard/KeyboardWindow.cpp +++ b/src/preferences/keyboard/KeyboardWindow.cpp @@ -24,8 +24,8 @@ #include #include -#undef TR_CONTEXT -#define TR_CONTEXT "KeyboardWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "KeyboardWindow" KeyboardWindow::KeyboardWindow() : BWindow(BRect(0, 0, 200, 200), B_TRANSLATE("Keyboard"), B_TITLED_WINDOW, diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp index e89739694d..12ca0dd4fd 100644 --- a/src/preferences/keymap/KeymapWindow.cpp +++ b/src/preferences/keymap/KeymapWindow.cpp @@ -39,7 +39,7 @@ #include "KeymapListItem.h" -#define TR_CONTEXT "Keymap window" +#define B_TRANSLATE_CONTEXT "Keymap window" static const uint32 kMsgMenuFileOpen = 'mMFO'; diff --git a/src/preferences/locale/LanguageListView.cpp b/src/preferences/locale/LanguageListView.cpp index d3f4597a74..6f769182f0 100644 --- a/src/preferences/locale/LanguageListView.cpp +++ b/src/preferences/locale/LanguageListView.cpp @@ -25,7 +25,7 @@ #define MAX_DRAG_HEIGHT 200.0 #define ALPHA 170 -#define TR_CONTEXT "LanguageListView" +#define B_TRANSLATE_CONTEXT "LanguageListView" LanguageListItem::LanguageListItem(const char* text, const char* id, diff --git a/src/preferences/locale/Locale.cpp b/src/preferences/locale/Locale.cpp index bbdd3dec86..4a43cc9f22 100644 --- a/src/preferences/locale/Locale.cpp +++ b/src/preferences/locale/Locale.cpp @@ -21,7 +21,7 @@ #include -#define TR_CONTEXT "Locale Preflet" +#define B_TRANSLATE_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 1c3d8c9ddb..6242e24f9b 100644 --- a/src/preferences/locale/LocaleWindow.cpp +++ b/src/preferences/locale/LocaleWindow.cpp @@ -34,7 +34,7 @@ #include "TimeFormatSettingsView.h" -#define TR_CONTEXT "Locale Preflet Window" +#define B_TRANSLATE_CONTEXT "Locale Preflet Window" static const uint32 kMsgLanguageInvoked = 'LaIv'; diff --git a/src/preferences/locale/TimeFormatSettingsView.cpp b/src/preferences/locale/TimeFormatSettingsView.cpp index 2484a401d9..092fbe9595 100644 --- a/src/preferences/locale/TimeFormatSettingsView.cpp +++ b/src/preferences/locale/TimeFormatSettingsView.cpp @@ -33,7 +33,7 @@ #include -#define TR_CONTEXT "TimeFormatSettings" +#define B_TRANSLATE_CONTEXT "TimeFormatSettings" class DateMenuItem: public BMenuItem { diff --git a/src/preferences/mail/Account.cpp b/src/preferences/mail/Account.cpp index 78f13f952b..62edb7088d 100644 --- a/src/preferences/mail/Account.cpp +++ b/src/preferences/mail/Account.cpp @@ -33,8 +33,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Account" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Account" static BList gAccounts; diff --git a/src/preferences/mail/ConfigViews.cpp b/src/preferences/mail/ConfigViews.cpp index 518c0ef1f7..af578e4d9f 100644 --- a/src/preferences/mail/ConfigViews.cpp +++ b/src/preferences/mail/ConfigViews.cpp @@ -35,8 +35,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Config Views" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Config Views" // AccountConfigView diff --git a/src/preferences/mail/ConfigWindow.cpp b/src/preferences/mail/ConfigWindow.cpp index d95cd53f03..21b59bf551 100644 --- a/src/preferences/mail/ConfigWindow.cpp +++ b/src/preferences/mail/ConfigWindow.cpp @@ -53,8 +53,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "Config Window" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Config Window" using std::nothrow; diff --git a/src/preferences/media/MediaViews.cpp b/src/preferences/media/MediaViews.cpp index dd5fd35a59..48628f6347 100644 --- a/src/preferences/media/MediaViews.cpp +++ b/src/preferences/media/MediaViews.cpp @@ -34,7 +34,7 @@ #include "MediaViews.h" -#define TR_CONTEXT "Media views" +#define B_TRANSLATE_CONTEXT "Media views" BarView::BarView() : BView ("barView", B_WILL_DRAW ), diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp index 2c535e2aa9..e67f81fb82 100644 --- a/src/preferences/media/MediaWindow.cpp +++ b/src/preferences/media/MediaWindow.cpp @@ -33,7 +33,7 @@ // Images #include "iconfile.h" -#define TR_CONTEXT "Media Window" +#define B_TRANSLATE_CONTEXT "Media Window" const uint32 ML_SELECTED_NODE = 'MlSN'; const uint32 ML_INIT_MEDIA = 'MlIM'; diff --git a/src/preferences/mouse/Mouse.cpp b/src/preferences/mouse/Mouse.cpp index 72d67e7d0d..7bcc805c6e 100644 --- a/src/preferences/mouse/Mouse.cpp +++ b/src/preferences/mouse/Mouse.cpp @@ -15,8 +15,8 @@ #include #include -#undef TR_CONTEXT -#define TR_CONTEXT "MouseApplication" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_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 4cd2804755..075e64d5d8 100644 --- a/src/preferences/mouse/MouseWindow.cpp +++ b/src/preferences/mouse/MouseWindow.cpp @@ -29,8 +29,8 @@ #include "MouseConstants.h" #include "SettingsView.h" -#undef TR_CONTEXT -#define TR_CONTEXT "MouseWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "MouseWindow" MouseWindow::MouseWindow(BRect _rect) : diff --git a/src/preferences/mouse/SettingsView.cpp b/src/preferences/mouse/SettingsView.cpp index a2bdb3bf52..868978b90c 100644 --- a/src/preferences/mouse/SettingsView.cpp +++ b/src/preferences/mouse/SettingsView.cpp @@ -64,8 +64,8 @@ focus_follows_mouse_mode_to_index(mode_focus_follows_mouse mode) // #pragma mark - -#undef TR_CONTEXT -#define TR_CONTEXT "SettingsView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "SettingsView" SettingsView::SettingsView(MouseSettings &settings) : BBox("main_view"), diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp index f9626ef805..8218f6de04 100644 --- a/src/preferences/network/EthernetSettingsView.cpp +++ b/src/preferences/network/EthernetSettingsView.cpp @@ -90,8 +90,8 @@ SetupTextControl(BTextControl *control) // #pragma mark - -#undef TR_CONTEXT -#define TR_CONTEXT "EthernetSettingsView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "EthernetSettingsView" EthernetSettingsView::EthernetSettingsView() : BView("EthernetSettingsView", 0, NULL), diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp index ac905554d9..63d01b0288 100644 --- a/src/preferences/network/NetworkWindow.cpp +++ b/src/preferences/network/NetworkWindow.cpp @@ -15,8 +15,8 @@ #include "EthernetSettingsView.h" -#undef TR_CONTEXT -#define TR_CONTEXT "NetworkWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "NetworkWindow" NetworkWindow::NetworkWindow() : BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), B_TITLED_WINDOW, diff --git a/src/preferences/opengl/CapabilitiesView.cpp b/src/preferences/opengl/CapabilitiesView.cpp index 2e5fb0cfe7..ef983e7913 100644 --- a/src/preferences/opengl/CapabilitiesView.cpp +++ b/src/preferences/opengl/CapabilitiesView.cpp @@ -21,7 +21,7 @@ #include -#define TR_CONTEXT "Capabilities" +#define B_TRANSLATE_CONTEXT "Capabilities" void diff --git a/src/preferences/opengl/ExtensionsList.cpp b/src/preferences/opengl/ExtensionsList.cpp index f1894e9358..c841e831d5 100644 --- a/src/preferences/opengl/ExtensionsList.cpp +++ b/src/preferences/opengl/ExtensionsList.cpp @@ -14,7 +14,7 @@ #include -#define TR_CONTEXT "Extensions" +#define B_TRANSLATE_CONTEXT "Extensions" ExtensionRow::ExtensionRow(const char* extensionName) diff --git a/src/preferences/opengl/ExtensionsView.cpp b/src/preferences/opengl/ExtensionsView.cpp index 57d0988c2f..bc97a0fdf1 100644 --- a/src/preferences/opengl/ExtensionsView.cpp +++ b/src/preferences/opengl/ExtensionsView.cpp @@ -19,7 +19,7 @@ #include -#define TR_CONTEXT "Extensions" +#define B_TRANSLATE_CONTEXT "Extensions" ExtensionsView::ExtensionsView() diff --git a/src/preferences/opengl/InfoView.cpp b/src/preferences/opengl/InfoView.cpp index 9312b42883..6550970471 100644 --- a/src/preferences/opengl/InfoView.cpp +++ b/src/preferences/opengl/InfoView.cpp @@ -21,7 +21,7 @@ #include -#define TR_CONTEXT "InfoView" +#define B_TRANSLATE_CONTEXT "InfoView" InfoView::InfoView() diff --git a/src/preferences/print/AddPrinterDialog.cpp b/src/preferences/print/AddPrinterDialog.cpp index 404c578f8b..56f56ee849 100644 --- a/src/preferences/print/AddPrinterDialog.cpp +++ b/src/preferences/print/AddPrinterDialog.cpp @@ -35,8 +35,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "AddPrinterDialog" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "AddPrinterDialog" AddPrinterDialog::AddPrinterDialog(BWindow *parent) diff --git a/src/preferences/print/JobListView.cpp b/src/preferences/print/JobListView.cpp index 20ae14d042..bb372e13aa 100644 --- a/src/preferences/print/JobListView.cpp +++ b/src/preferences/print/JobListView.cpp @@ -44,8 +44,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "JobListView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "JobListView" // #pragma mark -- JobListView diff --git a/src/preferences/print/PrinterListView.cpp b/src/preferences/print/PrinterListView.cpp index 2412f9e34b..f495409fbd 100644 --- a/src/preferences/print/PrinterListView.cpp +++ b/src/preferences/print/PrinterListView.cpp @@ -43,8 +43,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PrinterListView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PrinterListView" // #pragma mark -- PrinterListView diff --git a/src/preferences/print/PrintersWindow.cpp b/src/preferences/print/PrintersWindow.cpp index 0ab9b91104..bb0f8d4069 100644 --- a/src/preferences/print/PrintersWindow.cpp +++ b/src/preferences/print/PrintersWindow.cpp @@ -46,8 +46,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PrintersWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PrintersWindow" PrintersWindow::PrintersWindow(BRect frame) diff --git a/src/preferences/sounds/HApp.cpp b/src/preferences/sounds/HApp.cpp index 7185bf15ad..4f980eed3a 100644 --- a/src/preferences/sounds/HApp.cpp +++ b/src/preferences/sounds/HApp.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "SoundsHApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "SoundsHApp" HApp::HApp() diff --git a/src/preferences/sounds/HEventList.cpp b/src/preferences/sounds/HEventList.cpp index 4d353dd75e..f2ace9fcad 100644 --- a/src/preferences/sounds/HEventList.cpp +++ b/src/preferences/sounds/HEventList.cpp @@ -19,8 +19,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "HEventList" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_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 bfce5a99bd..9fc99003df 100644 --- a/src/preferences/sounds/HWindow.cpp +++ b/src/preferences/sounds/HWindow.cpp @@ -37,8 +37,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "HWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "HWindow" static const char kSettingsFile[] = "Sounds_Settings"; diff --git a/src/preferences/touchpad/TouchpadPrefView.cpp b/src/preferences/touchpad/TouchpadPrefView.cpp index 1813933fd5..8ae5bf5296 100644 --- a/src/preferences/touchpad/TouchpadPrefView.cpp +++ b/src/preferences/touchpad/TouchpadPrefView.cpp @@ -254,8 +254,8 @@ TouchpadView::DrawSliders() // #pragma mark - TouchpadPrefView -#undef TR_CONTEXT -#define TR_CONTEXT "TouchpadPrefView" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "TouchpadPrefView" TouchpadPrefView::TouchpadPrefView() diff --git a/src/preferences/touchpad/main.cpp b/src/preferences/touchpad/main.cpp index d36cc7f219..69c59770ed 100644 --- a/src/preferences/touchpad/main.cpp +++ b/src/preferences/touchpad/main.cpp @@ -35,8 +35,8 @@ public: }; -#undef TR_CONTEXT -#define TR_CONTEXT "TouchpadMain" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "TouchpadMain" int diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp index a0f0801e0e..4ac859bb98 100644 --- a/src/preferences/virtualmemory/SettingsWindow.cpp +++ b/src/preferences/virtualmemory/SettingsWindow.cpp @@ -31,8 +31,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "SettingsWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "SettingsWindow" static const uint32 kMsgDefaults = 'dflt'; diff --git a/src/preferences/virtualmemory/VirtualMemory.cpp b/src/preferences/virtualmemory/VirtualMemory.cpp index 0f16764705..203e769849 100644 --- a/src/preferences/virtualmemory/VirtualMemory.cpp +++ b/src/preferences/virtualmemory/VirtualMemory.cpp @@ -11,8 +11,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "VirtualMemoryApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "VirtualMemoryApp" VirtualMemory::VirtualMemory() diff --git a/src/servers/print/ConfigWindow.cpp b/src/servers/print/ConfigWindow.cpp index 49b509ba18..ee92552104 100644 --- a/src/servers/print/ConfigWindow.cpp +++ b/src/servers/print/ConfigWindow.cpp @@ -31,8 +31,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "ConfigWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "ConfigWindow" static const float a0_width = 2380.0; @@ -90,7 +90,7 @@ static void GetPageFormat(float w, float h, BString& label) struct PageFormat& pf = pageFormat[i]; if (pf.width == w && pf.height == h || pf.width == h && pf.height == w) { - label = be_catalog->GetString(pf.label, TR_CONTEXT); + label = be_catalog->GetString(pf.label, B_TRANSLATE_CONTEXT); return; } } diff --git a/src/servers/print/PrintServerApp.R5.cpp b/src/servers/print/PrintServerApp.R5.cpp index 0938a81e6a..d1c5523522 100644 --- a/src/servers/print/PrintServerApp.R5.cpp +++ b/src/servers/print/PrintServerApp.R5.cpp @@ -19,8 +19,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "PrintServerApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PrintServerApp" struct AsyncThreadParams { diff --git a/src/servers/print/PrintServerApp.cpp b/src/servers/print/PrintServerApp.cpp index f400c85c82..1063223d04 100644 --- a/src/servers/print/PrintServerApp.cpp +++ b/src/servers/print/PrintServerApp.cpp @@ -37,8 +37,8 @@ // for unlink -#undef TR_CONTEXT -#define TR_CONTEXT "PrintServerApp" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "PrintServerApp" BLocker *gLock = NULL; diff --git a/src/tests/kits/locale/catalogSpeed.cpp b/src/tests/kits/locale/catalogSpeed.cpp index 006a83ceb8..62399bd63f 100644 --- a/src/tests/kits/locale/catalogSpeed.cpp +++ b/src/tests/kits/locale/catalogSpeed.cpp @@ -36,7 +36,7 @@ class CatalogSpeed { void TestIdLookup(); }; -#define TR_CONTEXT "CatalogSpeed" +#define B_TRANSLATE_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] << TR_CONTEXT; + ctxs[i] << B_TRANSLATE_CONTEXT; trls[i] << "translation#" << 4000000+i; } diff --git a/src/tests/kits/locale/catalogTest.cpp b/src/tests/kits/locale/catalogTest.cpp index 638e7066a7..b683b074ab 100644 --- a/src/tests/kits/locale/catalogTest.cpp +++ b/src/tests/kits/locale/catalogTest.cpp @@ -22,7 +22,7 @@ class CatalogTest { void Check(); }; -#define TR_CONTEXT "CatalogTest" +#define B_TRANSLATE_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" << TR_CONTEXT << "\x01"; + s << "string" << "\x01" << B_TRANSLATE_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", TR_CONTEXT); + res = cata.SetString("string", "Schnur", B_TRANSLATE_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,13 @@ CatalogTest::Run() res = cata.SetString("string", "Textpuffer", "programming", "Deutsches Fachbuch"); assert(res == B_OK); - res = cata.SetString("string", "Leine", TR_CONTEXT, "Deutsches Fachbuch"); + res = cata.SetString("string", "Leine", B_TRANSLATE_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"), TR_CONTEXT); + s = cata.GetString(("string"), B_TRANSLATE_CONTEXT); assert(s == "Schnur"); s = cata.GetString(hashVal); assert(s == "Schnur_id"); @@ -69,7 +69,7 @@ CatalogTest::Run() assert(s == "String"); s = cata.GetString("string", "programming", "Deutsches Fachbuch"); assert(s == "Textpuffer"); - s = cata.GetString("string", TR_CONTEXT, "Deutsches Fachbuch"); + s = cata.GetString("string", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch"); assert(s == "Leine"); // now we create a new (base) catalog and embed this one into the app-file: @@ -83,7 +83,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", TR_CONTEXT); + res = catb.SetString("string", "hidden", B_TRANSLATE_CONTEXT); assert(res == B_OK); app_info appInfo; res = be_app->GetAppInfo(&appInfo); @@ -103,7 +103,7 @@ CatalogTest::Check() status_t res; printf("app-check..."); BString s; - s << "string" << "\x01" << TR_CONTEXT << "\x01"; + s << "string" << "\x01" << B_TRANSLATE_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 d6ec8ac5e1..f28f4a9ffc 100644 --- a/src/tests/kits/locale/catalogTestAddOn.cpp +++ b/src/tests/kits/locale/catalogTestAddOn.cpp @@ -16,7 +16,7 @@ class CatalogTestAddOn { void Check(); }; -#define TR_CONTEXT "CatalogTestAddOn" +#define B_TRANSLATE_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" << TR_CONTEXT << "\x01"; + s << "string" << "\x01" << B_TRANSLATE_CONTEXT << "\x01"; size_t hashVal = CatKey::HashFun(s.String()); assert(be_locale != NULL); system("mkdir -p ./locale/catalogs/"catSig); @@ -37,7 +37,7 @@ CatalogTestAddOn::Run() { assert(cat1.InitCheck() == B_OK); // ...and populate the catalog with some data: - res = cat1.SetString("string", "Schnur_A", TR_CONTEXT); + res = cat1.SetString("string", "Schnur_A", B_TRANSLATE_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 @@ -46,13 +46,13 @@ CatalogTestAddOn::Run() { assert(res == B_OK); res = cat1.SetString("string", "Textpuffer_A", "programming", "Deutsches Fachbuch"); assert(res == B_OK); - res = cat1.SetString("string", "Leine_A", TR_CONTEXT, "Deutsches Fachbuch"); + res = cat1.SetString("string", "Leine_A", B_TRANSLATE_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", TR_CONTEXT); + s = cat1.GetString("string", B_TRANSLATE_CONTEXT); assert(s == "Schnur_A"); s = cat1.GetString(hashVal); assert(s == "Schnur_id_A"); @@ -60,7 +60,7 @@ CatalogTestAddOn::Run() { assert(s == "String_A"); s = cat1.GetString("string", "programming", "Deutsches Fachbuch"); assert(s == "Textpuffer_A"); - s = cat1.GetString("string", TR_CONTEXT, "Deutsches Fachbuch"); + s = cat1.GetString("string", B_TRANSLATE_CONTEXT, "Deutsches Fachbuch"); assert(s == "Leine_A"); // now we create a new (base) catalog and embed this one into the add-on-file: @@ -73,7 +73,7 @@ CatalogTestAddOn::Run() { 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", TR_CONTEXT); + res = cat2.SetString("string", "hidden_A", B_TRANSLATE_CONTEXT); assert(res == B_OK); entry_ref addOnRef; res = get_add_on_ref(&addOnRef); @@ -91,7 +91,7 @@ CatalogTestAddOn::Check() { status_t res; printf("addon-check..."); BString s; - s << "string" << "\x01" << TR_CONTEXT << "\x01"; + s << "string" << "\x01" << B_TRANSLATE_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/net/preflet/NetworkSetupWindow.cpp b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp index 0b9c847c7a..e14f456499 100644 --- a/src/tests/kits/net/preflet/NetworkSetupWindow.cpp +++ b/src/tests/kits/net/preflet/NetworkSetupWindow.cpp @@ -17,8 +17,8 @@ #include -#undef TR_CONTEXT -#define TR_CONTEXT "NetworkSetupWindow" +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "NetworkSetupWindow" // --------------------------------------------------------------