diff --git a/src/apps/aboutsystem/Jamfile b/src/apps/aboutsystem/Jamfile
index ea0c00236c..c1003f8b43 100644
--- a/src/apps/aboutsystem/Jamfile
+++ b/src/apps/aboutsystem/Jamfile
@@ -17,3 +17,8 @@ DoCatalogs AboutSystem :
 	AboutSystem.cpp
 	Utilities.cpp
 ;
+
+AddCatalogEntryAttribute AboutSystem
+	:
+	"x-vnd.Haiku-About:AboutWindow:About this system"
+;
diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile
index 60c7dbfabd..2f1fbe5230 100644
--- a/src/apps/activitymonitor/Jamfile
+++ b/src/apps/activitymonitor/Jamfile
@@ -24,3 +24,8 @@ DoCatalogs ActivityMonitor :
 	DataSource.cpp
 	SettingsWindow.cpp
 ;
+
+AddCatalogEntryAttribute ActivityMonitor
+	:
+	"x-vnd.Haiku-ActivityMonitor:ActivityWindow:ActivityMonitor"
+;
diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile
index a141789323..20ead8c8af 100644
--- a/src/apps/bootmanager/Jamfile
+++ b/src/apps/bootmanager/Jamfile
@@ -28,6 +28,11 @@ Application BootManager :
 
 DoCatalogs BootManager : x-vnd.Haiku-BootManager : $(cataloguedSources) ;
 
+AddCatalogEntryAttribute BootManager
+	:
+	"x-vnd.Haiku-BootManager:BootManagerWindow:BootManager"
+;
+
 # Assemble the boot loader, and convert it into a header file
 
 # TODO: should be merged with the AssembleNasm rule
diff --git a/src/apps/cdplayer/Jamfile b/src/apps/cdplayer/Jamfile
index a878bb7d83..ad25cada84 100644
--- a/src/apps/cdplayer/Jamfile
+++ b/src/apps/cdplayer/Jamfile
@@ -22,3 +22,8 @@ DoCatalogs CDPlayer :
     :
 	CDPlayer.cpp
 ;
+
+AddCatalogEntryAttribute CDPlayer
+	:
+	"x-vnd.Haiku-CDPlayer:CDPlayer:CDPlayer"
+;
diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile
index 70dd91e310..9c8d19e4ec 100644
--- a/src/apps/charactermap/Jamfile
+++ b/src/apps/charactermap/Jamfile
@@ -22,3 +22,8 @@ DoCatalogs CharacterMap :
 	CharacterWindow.cpp
 	UnicodeBlocks.cpp
 ;
+
+AddCatalogEntryAttribute CharacterMap
+	:
+	"x-vnd.Haiku-CharacterMap:CharacterWindow:CharacterMap"
+;
diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index 26b02b7704..b32a0aa295 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -43,6 +43,7 @@ All rights reserved.
 #include <Path.h>
 #include <Debug.h>
 #include <File.h>
+#include <Locale.h>
 #include <MenuItem.h>
 #include <MessageFilter.h>
 #include <Screen.h>
@@ -58,6 +59,10 @@ All rights reserved.
 #include <MessagePrivate.h>
 
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "MainWindow"
+
+
 // This is a very ugly hack to be able to call the private BMenuBar::StartMenuBar()
 // method from the TBarWindow::ShowBeMenu() method.
 // Don't do this at home -- but why the hell is this method private?
@@ -78,7 +83,7 @@ TBeMenu* TBarWindow::sBeMenu = NULL;
 
 TBarWindow::TBarWindow()
 	:
-	BWindow(BRect(-1000.0f, -1000.0f, -1000.0f, -1000.0f), "Deskbar",
+	BWindow(BRect(-1000.0f, -1000.0f, -1000.0f, -1000.0f), B_TRANSLATE("Deskbar"),
 		B_BORDERED_WINDOW,
 		B_WILL_ACCEPT_FIRST_CLICK | B_NOT_ZOOMABLE | B_NOT_CLOSABLE
 			| B_NOT_MINIMIZABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE
diff --git a/src/apps/deskbar/Jamfile b/src/apps/deskbar/Jamfile
index 842e0ea130..68d4b5b47b 100644
--- a/src/apps/deskbar/Jamfile
+++ b/src/apps/deskbar/Jamfile
@@ -45,9 +45,15 @@ Application Deskbar :
 DoCatalogs Deskbar :
 	x-vnd.Be-TSKB
 	:
+	BarWindow.cpp
 	BeMenu.cpp
 	PreferencesWindow.cpp
 	StatusView.cpp
 	TimeView.cpp
 	WindowMenu.cpp
 	;
+
+AddCatalogEntryAttribute Deskbar
+	:
+	"x-vnd.Be-TSKB:MainWindow:Deskbar"
+;
diff --git a/src/apps/deskcalc/CalcWindow.cpp b/src/apps/deskcalc/CalcWindow.cpp
index 7930c4976b..03cb9ad37f 100644
--- a/src/apps/deskcalc/CalcWindow.cpp
+++ b/src/apps/deskcalc/CalcWindow.cpp
@@ -15,17 +15,19 @@
 #include <assert.h>
 
 #include <Application.h>
+#include <Catalog.h>
 #include <Dragger.h>
 #include <Screen.h>
 
 #include "CalcView.h"
 
 
-static const char* kWindowTitle		= "DeskCalc";
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "Window"
 
 
 CalcWindow::CalcWindow(BRect frame, BMessage* settings)
-	: BWindow(frame, kWindowTitle, B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
+	: BWindow(frame, B_TRANSLATE("DeskCalc"), B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
 {
 	// create calculator view with calculator description and
 	// desktop background color
diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile
index cdb5c7f8f9..81d3e06d72 100644
--- a/src/apps/deskcalc/Jamfile
+++ b/src/apps/deskcalc/Jamfile
@@ -22,4 +22,10 @@ DoCatalogs DeskCalc :
     :
 	CalcApplication.cpp
 	CalcView.cpp
+	CalcWindow.cpp
+;
+
+AddCatalogEntryAttribute DeskCalc
+	:
+	"x-vnd.Haiku-DeskCalc:Window:DeskCalc"
 ;
diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile
index 188950e1b0..0ff4d17cf2 100644
--- a/src/apps/devices/Jamfile
+++ b/src/apps/devices/Jamfile
@@ -88,6 +88,11 @@ DoCatalogs Devices :
 	Device.cpp
 ;
 
+AddCatalogEntryAttribute Devices
+	:
+	"x-vnd.Haiku-Devices:DevicesApplication:Devices"
+;
+
 Includes [ FGristFiles DevicesInfo.cpp ] : [ FGristFiles isapnpids.h usbdevs.h
 	usbdevs_data.h ] ;
 Includes [ FGristFiles ConfigurationWindow.cpp ] : [ FGristFiles pcihdr.h ] ;
diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile
index 466886e450..6777da26cb 100644
--- a/src/apps/diskprobe/Jamfile
+++ b/src/apps/diskprobe/Jamfile
@@ -31,3 +31,8 @@ DoCatalogs DiskProbe :
 	ProbeView.cpp
 	TypeEditors.cpp
 ;
+
+AddCatalogEntryAttribute DiskProbe
+	:
+	"x-vnd.Haiku-DiskProbe:OpenWindow:DiskProbe"
+;