diff --git a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
index cc6164709e..9a7e3064ba 100644
--- a/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
+++ b/src/add-ons/disk_systems/bfs/InitializeParameterEditor.cpp
@@ -10,6 +10,7 @@
 #include "InitializeParameterEditor.h"
 
 #include <Button.h>
+#include <Catalog.h>
 #include <CheckBox.h>
 #include <ControlLook.h>
 #include <GridLayoutBuilder.h>
@@ -22,6 +23,8 @@
 #include <View.h>
 #include <Window.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BFS_Initialize_Parameter"
 
 static uint32 MSG_BLOCK_SIZE = 'blsz';
 static uint32 MSG_NAME_CHANGED = 'nmch';
@@ -95,7 +98,7 @@ InitializeBFSEditor::PartitionNameChanged(const char* name)
 void
 InitializeBFSEditor::_CreateViewControls()
 {
-	fNameTC = new BTextControl("Name:", "Haiku", NULL);
+	fNameTC = new BTextControl(B_TRANSLATE("Name:"), "Haiku", NULL);
 	fNameTC->SetModificationMessage(new BMessage(MSG_NAME_CHANGED));
 	// TODO find out what is the max length for this specific FS partition name
 	fNameTC->TextView()->SetMaxBytes(31);
@@ -103,30 +106,32 @@ InitializeBFSEditor::_CreateViewControls()
 	BPopUpMenu* blocksizeMenu = new BPopUpMenu("blocksize");
 	BMessage* message = new BMessage(MSG_BLOCK_SIZE);
 	message->AddString("size", "1024");
-	blocksizeMenu->AddItem(new BMenuItem("1024 (Mostly small files)",
-		message));
+	blocksizeMenu->AddItem(new BMenuItem(
+		B_TRANSLATE("1024 (Mostly small files)"), message));
 	message = new BMessage(MSG_BLOCK_SIZE);
 	message->AddString("size", "2048");
-	BMenuItem* defaultItem = new BMenuItem("2048 (Recommended)", message);
+	BMenuItem* defaultItem = new BMenuItem(B_TRANSLATE("2048 (Recommended)"),
+		message);
 	blocksizeMenu->AddItem(defaultItem);
 	message = new BMessage(MSG_BLOCK_SIZE);
 	message->AddString("size", "4096");
 	blocksizeMenu->AddItem(new BMenuItem("4096", message));
 	message = new BMessage(MSG_BLOCK_SIZE);
 	message->AddString("size", "8192");
-	blocksizeMenu->AddItem(new BMenuItem("8192 (Mostly large files)",
-		message));
+	blocksizeMenu->AddItem(new BMenuItem(
+		B_TRANSLATE("8192 (Mostly large files)"), message));
 
-	fBlockSizeMF = new BMenuField("Blocksize:", blocksizeMenu, NULL);
+	fBlockSizeMF = new BMenuField(B_TRANSLATE("Blocksize:"), blocksizeMenu,
+		NULL);
 	defaultItem->SetMarked(true);
 
-	fUseIndicesCB = new BCheckBox("Enable query support", NULL);
+	fUseIndicesCB = new BCheckBox(B_TRANSLATE("Enable query support"), NULL);
 	fUseIndicesCB->SetValue(true);
-	fUseIndicesCB->SetToolTip("Disabling query support may speed up "
-		"certain file system operations, but should only be used "
+	fUseIndicesCB->SetToolTip(B_TRANSLATE("Disabling query support may speed "
+		"up certain file system operations, but should only be used "
 		"if one is absolutely certain that one will not need queries.\n"
 		"Any volume that is intended for booting Haiku must have query "
-		"support enabled.");
+		"support enabled."));
 
 	float spacing = be_control_look->DefaultItemSpacing();
 
diff --git a/src/add-ons/disk_systems/bfs/Jamfile b/src/add-ons/disk_systems/bfs/Jamfile
index 2be9729ed8..27c9140b8a 100644
--- a/src/add-ons/disk_systems/bfs/Jamfile
+++ b/src/add-ons/disk_systems/bfs/Jamfile
@@ -11,5 +11,12 @@ Addon <disk_system>bfs :
 
 	bfs_disk_system.cpp
 
-	: be $(TARGET_LIBSUPC++)
+	: be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+	: BFSAddOn.rdef
+;
+
+DoCatalogs <disk_system>bfs :
+	application/x-vnd.Haiku-BFSAddOn
+	:
+	InitializeParameterEditor.cpp	
 ;
diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp b/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
index ce81495f1c..09f8811c18 100644
--- a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
+++ b/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
@@ -6,11 +6,15 @@
 
 #include "CreationParameterEditor.h"
 
+#include <Catalog.h>
 #include <DiskDeviceTypes.h>
 #include <GroupView.h>
 #include <PartitionParameterEditor.h>
 #include <View.h>
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "BFS_Creation_Parameter"
+
 
 PrimaryPartitionEditor::PrimaryPartitionEditor()
 	:
@@ -19,7 +23,7 @@ PrimaryPartitionEditor::PrimaryPartitionEditor()
 	fActiveCB(NULL),
 	fParameters(NULL)
 {
-	fActiveCB = new BCheckBox("active", "Active partition", NULL);
+	fActiveCB = new BCheckBox("active", B_TRANSLATE("Active partition"), NULL);
 	fView = new BGroupView(B_VERTICAL);
 	fView->AddChild(fActiveCB);
 }
diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile
index babf063258..c8f5bcba12 100644
--- a/src/add-ons/disk_systems/intel/Jamfile
+++ b/src/add-ons/disk_systems/intel/Jamfile
@@ -21,5 +21,12 @@ Addon <disk_system>intel :
 	# kernel sources
 	PartitionMap.cpp
 
-	: be $(TARGET_LIBSUPC++)
+	: be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
+	: IntelDiskAddOn.rdef
+;
+
+DoCatalogs <disk_system>intel :
+	application/x-vnd.Haiku-IntelDiskAddOn
+	:
+	CreationParameterEditor.cpp
 ;