diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules
index 673206b38f..a28377cea2 100644
--- a/build/jam/BeOSRules
+++ b/build/jam/BeOSRules
@@ -359,19 +359,22 @@ actions LinkApplicationCatalog1
 		-s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
 }
 
-rule DoCatalogs appName : signature : sources : generatedCatalog
+rule DoCatalogs target : signature : sources : sourceLanguage
 {
-	# General rules to invoke from jamfiles and that do (almost) everything related
-	# to localization
+	# DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
 	#
-	# appName:			Application name.
+	# Extracts the catkeys from a target's source files, generates the
+	# default catalog from them, and also generates catalogs for all
+	# translations.
+	#
+	# target:			The target.
 	# signature: 		Application MIME signature (must match the one
 	#					declared in the sourcecode).
 	# sources: 			List of cpp files where to search keys.
-	# generatedCatalog:	Name of the generated catalog (most probably
-	#					en.catalog).
+	# sourceLanguage	Short name of the language of used for the strings in
+	#					the sources. Optional: default is "en".
 
-	generatedCatalog = [ FGristFiles $(generatedCatalog) ] ;
+	local generatedCatalog = [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ;
 
 	# generate catkeys file from sources
 	ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
@@ -391,6 +394,6 @@ rule DoCatalogs appName : signature : sources : generatedCatalog
 			: $(signature) : $(catkeysFile:B) ;
 	}
 
-	HAIKU_CATALOG_FILES on $(appName) = $(catkeysFiles:S=.catalog) ;
-	HAIKU_CATALOG_SIGNATURE on $(appName) = $(signature) ;
+	HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
+	HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
 }
diff --git a/src/add-ons/tracker/zipomatic/Jamfile b/src/add-ons/tracker/zipomatic/Jamfile
index 787184efb8..0b76f6b6ed 100644
--- a/src/add-ons/tracker/zipomatic/Jamfile
+++ b/src/add-ons/tracker/zipomatic/Jamfile
@@ -19,6 +19,5 @@ DoCatalogs ZipOMatic-Z :
 	ZipOMatic.cpp
 	ZipOMaticWindow.cpp
 	ZipperThread.cpp
-	: en.catalog
 ;
 
diff --git a/src/apps/aboutsystem/Jamfile b/src/apps/aboutsystem/Jamfile
index 06f89076e6..06d9a1c5d2 100644
--- a/src/apps/aboutsystem/Jamfile
+++ b/src/apps/aboutsystem/Jamfile
@@ -28,5 +28,4 @@ DoCatalogs AboutSystem :
 	:
 	AboutSystem.cpp
 	Utilities.cpp
-	: en.catalog
 ;
diff --git a/src/apps/bootman/Jamfile b/src/apps/bootman/Jamfile
index ff1a406b51..50897360f3 100644
--- a/src/apps/bootman/Jamfile
+++ b/src/apps/bootman/Jamfile
@@ -41,5 +41,4 @@ DoCatalogs bootman :
 	PartitionsPage.cpp
 	UninstallPage.cpp
 	WizardView.cpp
-	: en.catalog
 ;
diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile
index e7dbeaf4d9..1f8d8b1fb7 100644
--- a/src/apps/drivesetup/Jamfile
+++ b/src/apps/drivesetup/Jamfile
@@ -26,6 +26,5 @@ DoCatalogs DriveSetup :
 	MainWindow.cpp
 	PartitionList.cpp
 	Support.cpp
-	: en.catalog
 ;
 
diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile
index 2fc4b5a042..aee2680436 100644
--- a/src/apps/expander/Jamfile
+++ b/src/apps/expander/Jamfile
@@ -20,5 +20,4 @@ DoCatalogs Expander :
 	ExpanderWindow.cpp
 	ExpanderSettings.cpp
 	DirectoryFilePanel.cpp
-	: en.catalog
 ;
diff --git a/src/apps/installer/Jamfile b/src/apps/installer/Jamfile
index 6300bde379..53d7f75d69 100644
--- a/src/apps/installer/Jamfile
+++ b/src/apps/installer/Jamfile
@@ -24,6 +24,5 @@ DoCatalogs Installer :
 	PackageViews.cpp
 	ProgressReporter.cpp
 	WorkerThread.cpp
-	: en.catalog
 ;
 
diff --git a/src/apps/mail/Jamfile b/src/apps/mail/Jamfile
index 82d12f301c..eb76e94ac2 100644
--- a/src/apps/mail/Jamfile
+++ b/src/apps/mail/Jamfile
@@ -50,6 +50,5 @@ DoCatalogs Mail :
 	MailWindow.cpp
 	Prefs.cpp
 	Signature.cpp
-	: en.catalog
 ;
 
diff --git a/src/apps/midiplayer/Jamfile b/src/apps/midiplayer/Jamfile
index 96a4fcb21e..55b8a5b7d0 100644
--- a/src/apps/midiplayer/Jamfile
+++ b/src/apps/midiplayer/Jamfile
@@ -17,5 +17,4 @@ DoCatalogs MidiPlayer :
 	MidiPlayerApp.cpp 
 	MidiPlayerWindow.cpp 
 	ScopeView.cpp
-	: en.catalog
 ;
diff --git a/src/apps/pairs/Jamfile b/src/apps/pairs/Jamfile
index 0a851136a4..7a6411aad4 100644
--- a/src/apps/pairs/Jamfile
+++ b/src/apps/pairs/Jamfile
@@ -16,5 +16,4 @@ DoCatalogs Pairs :
 	x-vnd.Haiku-Pairs
 	:
 	PairsWindow.cpp
-	: en.catalog
 ;
diff --git a/src/apps/readonlybootprompt/Jamfile b/src/apps/readonlybootprompt/Jamfile
index bb2321198a..2f1934e2fd 100644
--- a/src/apps/readonlybootprompt/Jamfile
+++ b/src/apps/readonlybootprompt/Jamfile
@@ -18,6 +18,5 @@ DoCatalogs ReadOnlyBootPrompt :
 	:
 	BootPrompt.cpp
 	BootPromptWindow.cpp
-	: en.catalog
 ;
 
diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile
index 54f89d62db..49cf7d9a82 100644
--- a/src/apps/screenshot/Jamfile
+++ b/src/apps/screenshot/Jamfile
@@ -16,5 +16,4 @@ DoCatalogs Screenshot :
 	x-vnd.Haiku-Screenshot
 	:
 		ScreenshotWindow.cpp
-	: en.catalog
 ;
diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile
index 6738a352b1..d5140f6c30 100644
--- a/src/apps/showimage/Jamfile
+++ b/src/apps/showimage/Jamfile
@@ -28,5 +28,4 @@ DoCatalogs ShowImage :
 	ResizerWindow.cpp
 	ShowImageApp.cpp
 	ShowImageWindow.cpp
-	: en.catalog
 ;
diff --git a/src/apps/stylededit/Jamfile b/src/apps/stylededit/Jamfile
index 959d7b2ef2..a17bc59f2b 100644
--- a/src/apps/stylededit/Jamfile
+++ b/src/apps/stylededit/Jamfile
@@ -27,5 +27,4 @@ DoCatalogs StyledEdit :
 	ReplaceWindow.cpp
 	StyledEditApp.cpp
 	StyledEditWindow.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/appearance/Jamfile b/src/preferences/appearance/Jamfile
index b385543de7..5d944cc7e0 100644
--- a/src/preferences/appearance/Jamfile
+++ b/src/preferences/appearance/Jamfile
@@ -35,6 +35,5 @@ DoCatalogs Appearance :
 	ColorSet.cpp
 	ColorWell.cpp
 	ColorWhichItem.cpp
-	: en.catalog
 ;
 
diff --git a/src/preferences/backgrounds/Jamfile b/src/preferences/backgrounds/Jamfile
index f8a70a3dbe..77cd65aa2c 100644
--- a/src/preferences/backgrounds/Jamfile
+++ b/src/preferences/backgrounds/Jamfile
@@ -17,6 +17,5 @@ DoCatalogs Backgrounds :
 	Backgrounds.cpp
 	BackgroundsView.cpp
 	ImageFilePanel.cpp
-	: en.catalog
 ;
 
diff --git a/src/preferences/bluetooth/Jamfile b/src/preferences/bluetooth/Jamfile
index 366854ebe8..98f59650fb 100644
--- a/src/preferences/bluetooth/Jamfile
+++ b/src/preferences/bluetooth/Jamfile
@@ -27,6 +27,5 @@ DoCatalogs Bluetooth :
 	ExtendedLocalDeviceView.cpp
 	InquiryPanel.cpp
 	RemoteDevicesView.cpp
-	: en.catalog
 ;
 
diff --git a/src/preferences/cpufrequency/Jamfile b/src/preferences/cpufrequency/Jamfile
index 5b8b72dc8c..9ee1cbf17a 100644
--- a/src/preferences/cpufrequency/Jamfile
+++ b/src/preferences/cpufrequency/Jamfile
@@ -20,6 +20,5 @@ DoCatalogs CPUFrequency :
 	main.cpp
 	StatusView.cpp
 	PreferencesWindow.h
-	: en.catalog
 ;
 
diff --git a/src/preferences/fonts/Jamfile b/src/preferences/fonts/Jamfile
index 21f4d43923..649ab35ef6 100644
--- a/src/preferences/fonts/Jamfile
+++ b/src/preferences/fonts/Jamfile
@@ -17,6 +17,5 @@ DoCatalogs Fonts :
 	FontView.cpp
 	main.cpp
 	MainWindow.cpp
-	: en.catalog
 ;
 
diff --git a/src/preferences/keyboard/Jamfile b/src/preferences/keyboard/Jamfile
index a71eba9b4f..e32bf7736b 100644
--- a/src/preferences/keyboard/Jamfile
+++ b/src/preferences/keyboard/Jamfile
@@ -24,5 +24,4 @@ DoCatalogs Keyboard :
 	Keyboard.cpp
 	KeyboardWindow.cpp
 	KeyboardView.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/keymap/Jamfile b/src/preferences/keymap/Jamfile
index 4c2c0e0561..e3a1e6bdf1 100644
--- a/src/preferences/keymap/Jamfile
+++ b/src/preferences/keymap/Jamfile
@@ -19,5 +19,4 @@ Preference Keymap :
 DoCatalogs Keymap :
 	x-vnd.Haiku-Keymap
 	: KeymapWindow.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile
index f0b935460c..fa94ce6c8b 100644
--- a/src/preferences/locale/Jamfile
+++ b/src/preferences/locale/Jamfile
@@ -19,6 +19,5 @@ DoCatalogs Locale		# application name
 	Locale.cpp
 	LocaleWindow.cpp
 	TimeFormatSettingsView.cpp
-	: en.catalog		# default catalog generated from sourcecode
 ;
 
diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile
index 14a717a251..2e241706f7 100644
--- a/src/preferences/media/Jamfile
+++ b/src/preferences/media/Jamfile
@@ -23,5 +23,4 @@ DoCatalogs Media
 	: x-vnd.Haiku-Media
 	: MediaViews.cpp
 	  MediaWindow.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/mouse/Jamfile b/src/preferences/mouse/Jamfile
index c41ed53714..eafeca20e3 100644
--- a/src/preferences/mouse/Jamfile
+++ b/src/preferences/mouse/Jamfile
@@ -18,5 +18,4 @@ DoCatalogs Mouse :
 	Mouse.cpp
 	MouseWindow.cpp
 	SettingsView.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile
index cb437e955d..7099e617b3 100644
--- a/src/preferences/network/Jamfile
+++ b/src/preferences/network/Jamfile
@@ -18,5 +18,4 @@ DoCatalogs Network :
 	:
 	EthernetSettingsView.cpp
 	NetworkWindow.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/opengl/Jamfile b/src/preferences/opengl/Jamfile
index 815c15ed64..ba37216294 100644
--- a/src/preferences/opengl/Jamfile
+++ b/src/preferences/opengl/Jamfile
@@ -22,6 +22,5 @@ DoCatalogs OpenGL :
 	ExtensionsList.cpp
 	ExtensionsView.cpp
 	InfoView.cpp
-	: en.catalog
 ;
 	
diff --git a/src/preferences/print/Jamfile b/src/preferences/print/Jamfile
index 3f56cc73fc..e1d7757225 100644
--- a/src/preferences/print/Jamfile
+++ b/src/preferences/print/Jamfile
@@ -27,7 +27,5 @@ DoCatalogs Printers :
 	JobListView.cpp
 	PrinterListView.cpp
 	PrintersWindow.cpp
-	: 
-	en.catalog
 ;
 	
diff --git a/src/preferences/touchpad/Jamfile b/src/preferences/touchpad/Jamfile
index 12e8008104..165bee3b1d 100644
--- a/src/preferences/touchpad/Jamfile
+++ b/src/preferences/touchpad/Jamfile
@@ -15,5 +15,4 @@ DoCatalogs Touchpad :
 	:
 	TouchpadPrefView.cpp
 	main.cpp
-	: en.catalog
 ;
diff --git a/src/preferences/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile
index 5a902aa965..488cbeabee 100644
--- a/src/preferences/virtualmemory/Jamfile
+++ b/src/preferences/virtualmemory/Jamfile
@@ -20,5 +20,4 @@ DoCatalogs VirtualMemory :
     : 
     VirtualMemory.cpp 
     SettingsWindow.cpp 
-    : en.catalog 
 ; 
diff --git a/src/servers/print/Jamfile b/src/servers/print/Jamfile
index 71d3546153..8e435b9e83 100644
--- a/src/servers/print/Jamfile
+++ b/src/servers/print/Jamfile
@@ -36,7 +36,5 @@ DoCatalogs print_server :
 	ConfigWindow.cpp
 	PrintServerApp.cpp
 	PrintServerApp.R5.cpp
-	: 
-	en.catalog
 ;