diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp
index 3858207842..0b03debf02 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -25,9 +25,9 @@ static const uint32 kMsgSetDefaults = 'dflt';
 static const uint32 kMsgRevert = 'rvrt';
 
 APRWindow::APRWindow(BRect frame)
- :	BWindow(frame, B_TRANSLATE("Appearance"), B_TITLED_WINDOW,
- 		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
- 		B_ALL_WORKSPACES)
+	:
+	BWindow(frame, B_TRANSLATE_APP_NAME("Appearance"), B_TITLED_WINDOW,
+ 		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES)
 {
 
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
diff --git a/src/preferences/backgrounds/Backgrounds.cpp b/src/preferences/backgrounds/Backgrounds.cpp
index 0abab951a8..2d078cf4e9 100644
--- a/src/preferences/backgrounds/Backgrounds.cpp
+++ b/src/preferences/backgrounds/Backgrounds.cpp
@@ -90,8 +90,9 @@ BackgroundsApplication::RefsReceived(BMessage* message)
 
 BackgroundsWindow::BackgroundsWindow()
 	:
-	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Backgrounds"), B_TITLED_WINDOW,
-		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
+	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Backgrounds"),
+		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+			| B_AUTO_UPDATE_SIZE_LIMITS,
 		B_ALL_WORKSPACES)
 {
 	fBackgroundsView = new BackgroundsView();
diff --git a/src/preferences/bluetooth/BluetoothWindow.cpp b/src/preferences/bluetooth/BluetoothWindow.cpp
index 2b18fcc239..0ae5670e44 100644
--- a/src/preferences/bluetooth/BluetoothWindow.cpp
+++ b/src/preferences/bluetooth/BluetoothWindow.cpp
@@ -34,8 +34,9 @@ LocalDevice* ActiveLocalDevice = NULL;
 
 
 BluetoothWindow::BluetoothWindow(BRect frame)
- :	BWindow(frame, B_TRANSLATE("Bluetooth"), B_TITLED_WINDOW,
- 		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
+	:
+	BWindow(frame, B_TRANSLATE_APP_NAME("Bluetooth"), B_TITLED_WINDOW,
+		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 
diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp
index 3d39081370..7a24e783f3 100644
--- a/src/preferences/bluetooth/InquiryPanel.cpp
+++ b/src/preferences/bluetooth/InquiryPanel.cpp
@@ -93,7 +93,7 @@ private:
 
 InquiryPanel::InquiryPanel(BRect frame, LocalDevice* lDevice)
 	:
-	BWindow(frame, B_TRANSLATE("Bluetooth"), B_FLOATING_WINDOW,
+	BWindow(frame, B_TRANSLATE_APP_NAME("Bluetooth"), B_FLOATING_WINDOW,
 	B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,	B_ALL_WORKSPACES ),
 	fMessenger(this),
  	fScanning(false),
diff --git a/src/preferences/cpufrequency/main.cpp b/src/preferences/cpufrequency/main.cpp
index 9cc9036aba..e1b00321ef 100644
--- a/src/preferences/cpufrequency/main.cpp
+++ b/src/preferences/cpufrequency/main.cpp
@@ -26,11 +26,10 @@ main(int argc, char* argv[])
 
 	PreferencesWindow<freq_preferences> *window;
 	window = new PreferencesWindow<freq_preferences>(
-												B_TRANSLATE("CPU Frequency"),
-												kPreferencesFileName,
-												kDefaultPreferences);
-	CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350),
-														window);
+		B_TRANSLATE_APP_NAME("CPUFrequency"), kPreferencesFileName,
+		kDefaultPreferences);
+	CPUFrequencyView* prefView
+		= new CPUFrequencyView(BRect(0, 0, 400, 350), window);
 	window->SetPreferencesView(prefView);
 	window->Show();
 	app->Run();
diff --git a/src/preferences/datatranslations/DataTranslationsWindow.cpp b/src/preferences/datatranslations/DataTranslationsWindow.cpp
index a0a14b922e..c307dd860d 100644
--- a/src/preferences/datatranslations/DataTranslationsWindow.cpp
+++ b/src/preferences/datatranslations/DataTranslationsWindow.cpp
@@ -47,7 +47,7 @@ const uint32 kMsgSelectedTranslator = 'trsl';
 
 DataTranslationsWindow::DataTranslationsWindow()
 	:
-	BWindow(BRect(0, 0, 550, 350), B_TRANSLATE("DataTranslations"),
+	BWindow(BRect(0, 0, 550, 350), B_TRANSLATE_APP_NAME("DataTranslations"),
 		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
 		| B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
diff --git a/src/preferences/deskbar/DeskbarPreferences.cpp b/src/preferences/deskbar/DeskbarPreferences.cpp
index 49213add32..c3299770fc 100644
--- a/src/preferences/deskbar/DeskbarPreferences.cpp
+++ b/src/preferences/deskbar/DeskbarPreferences.cpp
@@ -10,12 +10,14 @@
 #include "PreferencesWindow.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Roster.h>
 
 
 int 
 main(int argc, char **argv)
 {
+	B_TRANSLATE_MARK_APP_NAME("Deskbar");
 	BApplication app("application/x-vnd.Haiku-DeskbarPreferences");
 	be_roster->Launch("application/x-vnd.Be-TSKB", new BMessage(kConfigShow));
 	return 0;
diff --git a/src/preferences/deskbar/Jamfile b/src/preferences/deskbar/Jamfile
index d8156a32aa..61994bb95a 100644
--- a/src/preferences/deskbar/Jamfile
+++ b/src/preferences/deskbar/Jamfile
@@ -2,9 +2,18 @@ SubDir HAIKU_TOP src preferences deskbar ;
 
 SubDirSysHdrs $(HAIKU_TOP) src apps deskbar ;
 
-Preference <preference>Deskbar :
+Preference <preference>Deskbar
+	:
 	DeskbarPreferences.cpp
-	: be
-	: DeskbarPreferences.rdef
-	;
+	:
+	be $(HAIKU_LOCALE_LIBS)
+	:
+	DeskbarPreferences.rdef
+;
 
+DoCatalogs <preference>Deskbar
+	:
+	x-vnd.Haiku-DeskbarPreferences
+	:
+	DeskbarPreferences.cpp
+;
diff --git a/src/preferences/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp
index 6524714a58..b321908e48 100644
--- a/src/preferences/filetypes/FileTypesWindow.cpp
+++ b/src/preferences/filetypes/FileTypesWindow.cpp
@@ -307,8 +307,9 @@ ExtensionListView::SetType(BMimeType* type)
 
 FileTypesWindow::FileTypesWindow(const BMessage& settings)
 	:
-	BWindow(_Frame(settings), B_TRANSLATE("FileTypes"), B_TITLED_WINDOW,
-		B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
+	BWindow(_Frame(settings), B_TRANSLATE_APP_NAME("FileTypes"),
+		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+		| B_AUTO_UPDATE_SIZE_LIMITS),
 	fNewTypeWindow(NULL)
 {
 	bool showIcons;
diff --git a/src/preferences/fonts/MainWindow.cpp b/src/preferences/fonts/MainWindow.cpp
index 808c212415..7efc2022d0 100644
--- a/src/preferences/fonts/MainWindow.cpp
+++ b/src/preferences/fonts/MainWindow.cpp
@@ -39,7 +39,7 @@ static const uint32 kMsgCheckFonts = 'chkf';
 
 
 MainWindow::MainWindow()
-	: BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("Fonts"), B_TITLED_WINDOW,
+	: BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("Fonts"), B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"),
diff --git a/src/preferences/keyboard/KeyboardWindow.cpp b/src/preferences/keyboard/KeyboardWindow.cpp
index b732a93099..9f36528e6c 100644
--- a/src/preferences/keyboard/KeyboardWindow.cpp
+++ b/src/preferences/keyboard/KeyboardWindow.cpp
@@ -28,9 +28,10 @@
 #define B_TRANSLATE_CONTEXT "KeyboardWindow"
 
 KeyboardWindow::KeyboardWindow()
-	: BWindow(BRect(0, 0, 200, 200), B_TRANSLATE("Keyboard"), B_TITLED_WINDOW,
- 		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
- 		| B_AUTO_UPDATE_SIZE_LIMITS)
+	:
+	BWindow(BRect(0, 0, 200, 200), B_TRANSLATE_APP_NAME("Keyboard"),
+		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+		| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	MoveTo(fSettings.WindowCorner());
 
diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp
index 81b36a8844..9bde0c6f90 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -70,8 +70,8 @@ static const char* kCurrentKeymapName = "(Current)";
 
 KeymapWindow::KeymapWindow()
 	:
-	BWindow(BRect(80, 50, 880, 380), B_TRANSLATE("Keymap"), B_TITLED_WINDOW,
-		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
+	BWindow(BRect(80, 50, 880, 380), B_TRANSLATE_APP_NAME("Keymap"),
+		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	SetLayout(new BGroupLayout(B_VERTICAL));
 
diff --git a/src/preferences/locale/LocaleWindow.cpp b/src/preferences/locale/LocaleWindow.cpp
index 87b85ee5e1..ae7f653959 100644
--- a/src/preferences/locale/LocaleWindow.cpp
+++ b/src/preferences/locale/LocaleWindow.cpp
@@ -66,7 +66,7 @@ compare_typed_list_items(const BListItem* _a, const BListItem* _b)
 
 LocaleWindow::LocaleWindow()
 	:
-	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Locale"), B_TITLED_WINDOW,
+	BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_APP_NAME("Locale"), B_TITLED_WINDOW,
 		B_QUIT_ON_WINDOW_CLOSE | B_ASYNCHRONOUS_CONTROLS
 			| B_AUTO_UPDATE_SIZE_LIMITS),
 	fInitialConventionsItem(NULL),
diff --git a/src/preferences/mail/ConfigWindow.cpp b/src/preferences/mail/ConfigWindow.cpp
index 1997e9aced..70828e9577 100644
--- a/src/preferences/mail/ConfigWindow.cpp
+++ b/src/preferences/mail/ConfigWindow.cpp
@@ -305,7 +305,7 @@ class AboutTextView : public BTextView
 
 ConfigWindow::ConfigWindow()
 	:
-	BWindow(BRect(100.0, 100.0, 580.0, 540.0), B_TRANSLATE("E-mail"),
+	BWindow(BRect(100.0, 100.0, 580.0, 540.0), B_TRANSLATE_APP_NAME("E-mail"),
 		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
 		| B_NOT_RESIZABLE),
 	fLastSelectedAccount(NULL),
diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp
index 13022fbdd1..c5989d5f94 100644
--- a/src/preferences/media/MediaWindow.cpp
+++ b/src/preferences/media/MediaWindow.cpp
@@ -151,7 +151,7 @@ MediaWindow::SmartNode::_FreeNode()
 // MediaWindow - Constructor
 MediaWindow::MediaWindow(BRect frame)
 	:
-	BWindow(frame, B_TRANSLATE("Media"), B_TITLED_WINDOW,
+	BWindow(frame, B_TRANSLATE_APP_NAME("Media"), B_TITLED_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
 	fCurrentNode(BMessenger(this)),
 	fParamWeb(NULL),
diff --git a/src/preferences/mouse/MouseWindow.cpp b/src/preferences/mouse/MouseWindow.cpp
index 075e64d5d8..33056c129e 100644
--- a/src/preferences/mouse/MouseWindow.cpp
+++ b/src/preferences/mouse/MouseWindow.cpp
@@ -34,9 +34,9 @@
 
 MouseWindow::MouseWindow(BRect _rect)
 	:
-		BWindow(_rect, B_TRANSLATE("Mouse"), B_TITLED_WINDOW,
-			B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS |
-				B_AUTO_UPDATE_SIZE_LIMITS)
+	BWindow(_rect, B_TRANSLATE_APP_NAME("Mouse"), B_TITLED_WINDOW,
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+		| B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	// Add the main settings view
 	fSettingsView = new SettingsView(fSettings);
diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp
index fd33f987e4..461cd59ea2 100644
--- a/src/preferences/network/NetworkWindow.cpp
+++ b/src/preferences/network/NetworkWindow.cpp
@@ -23,9 +23,9 @@
 
 NetworkWindow::NetworkWindow()
 	:
-	BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), B_TITLED_WINDOW,
-		B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
-		| B_AUTO_UPDATE_SIZE_LIMITS | B_QUIT_ON_WINDOW_CLOSE)
+	BWindow(BRect(50, 50, 269, 302), B_TRANSLATE_APP_NAME("Network"),
+		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+		| B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_QUIT_ON_WINDOW_CLOSE)
 {
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 	GetLayout()->AddView(new EthernetSettingsView());
diff --git a/src/preferences/notifications/PrefletWin.cpp b/src/preferences/notifications/PrefletWin.cpp
index 0d0d85636f..27977f5320 100644
--- a/src/preferences/notifications/PrefletWin.cpp
+++ b/src/preferences/notifications/PrefletWin.cpp
@@ -27,9 +27,9 @@ const int32 kSave = '_SAV';
 
 PrefletWin::PrefletWin()
 	:
-	BWindow(BRect(0, 0, 1, 1), B_TRANSLATE("Notifications"), B_TITLED_WINDOW,
-		B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
-		| B_AUTO_UPDATE_SIZE_LIMITS)
+	BWindow(BRect(0, 0, 1, 1), B_TRANSLATE_APP_NAME("Notifications"),
+		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE
+		| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	// Preflet container view
 	fMainView = new PrefletView(this);
diff --git a/src/preferences/opengl/Jamfile b/src/preferences/opengl/Jamfile
index 8701af5df7..2ae1d1ab33 100644
--- a/src/preferences/opengl/Jamfile
+++ b/src/preferences/opengl/Jamfile
@@ -23,5 +23,6 @@ DoCatalogs OpenGL :
 	ExtensionsList.cpp
 	ExtensionsView.cpp
 	InfoView.cpp
+	OpenGLWindow.cpp
 ;
 	
diff --git a/src/preferences/opengl/OpenGLWindow.cpp b/src/preferences/opengl/OpenGLWindow.cpp
index e13f1a114c..9b705dd051 100644
--- a/src/preferences/opengl/OpenGLWindow.cpp
+++ b/src/preferences/opengl/OpenGLWindow.cpp
@@ -9,14 +9,16 @@
 #include "OpenGLWindow.h"
 
 #include <Application.h>
+#include <Catalog.h>
 #include <GroupLayout.h>
 #include "OpenGLView.h"
 
 
 OpenGLWindow::OpenGLWindow()
-    : BWindow(BRect(50, 50, 450, 400), "OpenGL", B_TITLED_WINDOW,
-        B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
-        | B_AUTO_UPDATE_SIZE_LIMITS)
+	:
+	BWindow(BRect(50, 50, 450, 400), B_TRANSLATE_APP_NAME("OpenGL"),
+		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
+		| B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
     SetLayout(new BGroupLayout(B_VERTICAL));
     fView = new OpenGLView();
diff --git a/src/preferences/printers/PrintersWindow.cpp b/src/preferences/printers/PrintersWindow.cpp
index ca72dd48b9..1e2bb49edd 100644
--- a/src/preferences/printers/PrintersWindow.cpp
+++ b/src/preferences/printers/PrintersWindow.cpp
@@ -12,7 +12,6 @@
 
 #include <stdio.h>
 
-// BeOS API
 #include <Application.h>
 #include <Button.h>
 #include <Catalog.h>
@@ -39,8 +38,8 @@
 
 PrintersWindow::PrintersWindow(BRect frame)
 	:
-	Inherited(BRect(78, 71, 761, 509), B_TRANSLATE("Printers"),	B_TITLED_WINDOW,
-		0),
+	BWindow(BRect(78, 71, 761, 509), B_TRANSLATE_APP_NAME("Printers"),
+		B_TITLED_WINDOW, 0),
 	fSelectedPrinter(NULL),
 	fAddingPrinter(false)
 {
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index adadd1f44a..d3842addf9 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -165,8 +165,8 @@ screen_errors(status_t status)
 
 ScreenWindow::ScreenWindow(ScreenSettings* settings)
 	:
-	BWindow(settings->WindowFrame(), B_TRANSLATE("Screen"), B_TITLED_WINDOW,
-		B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
+	BWindow(settings->WindowFrame(), B_TRANSLATE_APP_NAME("Screen"),
+		B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
 		B_ALL_WORKSPACES),
 	fBootWorkspaceApplied(false),
 	fScreenMode(this),
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index d2d9494a3c..14ddd67ce1 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -613,7 +613,7 @@ ModulesView::_OpenSaver()
 
 ScreenSaverWindow::ScreenSaverWindow()
 	:
-	BWindow(BRect(50, 50, 496, 375), B_TRANSLATE("ScreenSaver"),
+	BWindow(BRect(50, 50, 496, 375), B_TRANSLATE_APP_NAME("ScreenSaver"),
 		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
 	fSettings.Load();
diff --git a/src/preferences/shortcuts/ShortcutsWindow.cpp b/src/preferences/shortcuts/ShortcutsWindow.cpp
index d7aae1a015..052c26f40e 100644
--- a/src/preferences/shortcuts/ShortcutsWindow.cpp
+++ b/src/preferences/shortcuts/ShortcutsWindow.cpp
@@ -95,7 +95,7 @@ CreateKeysPopUp()
 ShortcutsWindow::ShortcutsWindow()
 	:
 	BWindow(BRect(WINDOW_START_X, WINDOW_START_Y, WINDOW_START_X + MIN_WIDTH, 
-		WINDOW_START_Y + MIN_HEIGHT * 2), B_TRANSLATE("Shortcuts"),
+		WINDOW_START_Y + MIN_HEIGHT * 2), B_TRANSLATE_APP_NAME("Shortcuts"),
 		B_DOCUMENT_WINDOW, 0L), 
 	fSavePanel(NULL), 
 	fOpenPanel(NULL), 
diff --git a/src/preferences/sounds/HApp.cpp b/src/preferences/sounds/HApp.cpp
index ff4be87976..431fef8936 100644
--- a/src/preferences/sounds/HApp.cpp
+++ b/src/preferences/sounds/HApp.cpp
@@ -28,7 +28,7 @@ HApp::HApp()
 	BRect rect;
 	rect.Set(200, 150, 590, 570);
 
-	HWindow* window = new HWindow(rect, B_TRANSLATE("Sounds"));
+	HWindow* window = new HWindow(rect, B_TRANSLATE_APP_NAME("Sounds"));
 	window->Show();
 }
 
diff --git a/src/preferences/time/TimeWindow.cpp b/src/preferences/time/TimeWindow.cpp
index 745d42122c..71062fa5c3 100644
--- a/src/preferences/time/TimeWindow.cpp
+++ b/src/preferences/time/TimeWindow.cpp
@@ -27,7 +27,9 @@
 #define B_TRANSLATE_CONTEXT "Time"
 
 TTimeWindow::TTimeWindow(BRect rect)
-	: BWindow(rect, B_TRANSLATE("Time"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
+	:
+	BWindow(rect, B_TRANSLATE_APP_NAME("Time"), B_TITLED_WINDOW,
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE)
 {
 	_InitWindow();
 	_AlignWindow();
diff --git a/src/preferences/touchpad/main.cpp b/src/preferences/touchpad/main.cpp
index b1679150cd..bb99838a1d 100644
--- a/src/preferences/touchpad/main.cpp
+++ b/src/preferences/touchpad/main.cpp
@@ -45,7 +45,7 @@ main(int argc, char* argv[])
 	BApplication* app = new BApplication("application/x-vnd.Haiku-Touchpad");
 
 	TouchpadPrefWindow* window = new TouchpadPrefWindow(BRect(50, 50, 450, 350),
-		B_TRANSLATE("Touchpad"), B_TITLED_WINDOW,
+		B_TRANSLATE_APP_NAME("Touchpad"), B_TITLED_WINDOW,
 		B_NOT_RESIZABLE | B_NOT_ZOOMABLE
 			| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS);
 	window->SetLayout(new BGroupLayout(B_HORIZONTAL));
diff --git a/src/preferences/tracker/Jamfile b/src/preferences/tracker/Jamfile
index 7c717f34ab..35fcb26be5 100644
--- a/src/preferences/tracker/Jamfile
+++ b/src/preferences/tracker/Jamfile
@@ -1,7 +1,17 @@
 SubDir HAIKU_TOP src preferences tracker ;
 
-Preference <preference>Tracker :
+Preference <preference>Tracker
+	:
 	TrackerPreferences.cpp
-	: be
-	: TrackerPreferences.rdef
-	;
+	:
+	be $(HAIKU_LOCALE_LIBS)
+	:
+	TrackerPreferences.rdef
+;
+
+DoCatalogs <preference>Tracker
+	:
+	x-vnd.Haiku-TrackerPreferences
+	:
+	TrackerPreferences.cpp
+;
diff --git a/src/preferences/tracker/TrackerPreferences.cpp b/src/preferences/tracker/TrackerPreferences.cpp
index eab7d725b9..9405aaa5d0 100644
--- a/src/preferences/tracker/TrackerPreferences.cpp
+++ b/src/preferences/tracker/TrackerPreferences.cpp
@@ -7,12 +7,14 @@
  */
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Roster.h>
 
 
 int 
 main(int argc, char **argv)
 {
+	B_TRANSLATE_MARK_APP_NAME("Tracker");
 	BApplication app("application/x-vnd.Haiku-TrackerPreferences");
 	
 	// launch Tracker if it's not running
diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index a0ce7a2d02..ca9ec231b0 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -129,7 +129,7 @@ VolumeMenuItem::VolumeMenuItem(const char* label, BMessage* message,
 
 SettingsWindow::SettingsWindow()
 	:
-	BWindow(BRect(0, 0, 269, 172), B_TRANSLATE("VirtualMemory"),
+	BWindow(BRect(0, 0, 269, 172), B_TRANSLATE_APP_NAME("VirtualMemory"),
 		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
 		| B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
 	fLocked(false)