diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b3159d0a9565e1f55b5e4ab6cbadb59129a25141..27efb49dd66d1aa65342fd3bc48c838602232ea2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@ $Id$
 
 -- 2008-11-19 version 5.x-2.x-dev
 * #334947 Added LoginToboggan administration pages to the default exclusion list
+* #322939 Fixed: Distinguish between Teaser and page break
 
 -- 2008-11-14 version 5.x-2.x-dev
 * #332727 Fixed: Fatal php error in PHP4
diff --git a/fckeditor.config.js b/fckeditor.config.js
index 055a2532b190f09cc6970ce2647eca8c5c44e02d..355d77caae78151db1ec88d99e88191a9ede25f1 100644
--- a/fckeditor.config.js
+++ b/fckeditor.config.js
@@ -33,8 +33,8 @@ FCKConfig.PluginsPath = '../../plugins/' ;
 FCKConfig.Plugins.Add( 'imgassist' ) ;
 //FCKConfig.Plugins.Add( 'linktonode', 'en,pl' ) ;
 //FCKConfig.Plugins.Add( 'linktomenu', 'en,pl' ) ;
-//FCKConfig.Plugins.Add( 'drupalbreak' ) ;
-//FCKConfig.Plugins.Add( 'drupalpagebreak' ) ;
+//FCKConfig.Plugins.Add( 'drupalbreak', 'en,pl' ) ;
+//FCKConfig.Plugins.Add( 'drupalpagebreak', 'en,pl' ) ;
 
 /*
  This toolbar is dedicated to users with "Full HTML" access 
diff --git a/plugins/drupalbreak/fckplugin.js b/plugins/drupalbreak/fckplugin.js
index 606c60ec15e7867fff5861ca34f35e539c78f73c..252b744ec031f23c2ec61e9852acd7823838d790 100644
--- a/plugins/drupalbreak/fckplugin.js
+++ b/plugins/drupalbreak/fckplugin.js
@@ -138,7 +138,7 @@ FCKDrupalBreak.prototype.GetState = function()
 // Register the Drupal tag commands.
 FCKCommands.RegisterCommand( 'DrupalBreak', new FCKDrupalBreak( 'Break' ) ) ;
 // Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalBreak', FCKLang.DrupalBreakTitle, FCKLang.DrupalBreakTooltip, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
 oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalbreak/drupalbreak.gif';
 FCKToolbarItems.RegisterItem( 'DrupalBreak', oDrupalItem ) ;
 
diff --git a/plugins/drupalbreak/lang/en.js b/plugins/drupalbreak/lang/en.js
index a21c533de09f822a1f7625253bbbb474f53fcae0..3a9cc4a1a55d8b052b2cd008a48cdc004d854ac5 100644
--- a/plugins/drupalbreak/lang/en.js
+++ b/plugins/drupalbreak/lang/en.js
@@ -1 +1,2 @@
-FCKLang.DrupalBreakTitle			= 'Insert Teaser Break' ;
+FCKLang.DrupalBreakTooltip = 'Insert Teaser Break' ;
+FCKLang.DrupalBreakTitle = 'Teaser' ;
diff --git a/plugins/drupalbreak/lang/pl.js b/plugins/drupalbreak/lang/pl.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed677028826d596909e21f2b797079cc9606186d
--- /dev/null
+++ b/plugins/drupalbreak/lang/pl.js
@@ -0,0 +1,2 @@
+FCKLang.DrupalBreakTooltip = 'Wstaw znacznik oznaczający koniec skrótu' ;
+FCKLang.DrupalBreakTitle = 'Skrót' ;
diff --git a/plugins/drupalpagebreak/fckplugin.js b/plugins/drupalpagebreak/fckplugin.js
index 48f06badd6a600a98030d63ce030a97a8822c6f3..e2380548b792993142156bf62787a67db99050e7 100644
--- a/plugins/drupalpagebreak/fckplugin.js
+++ b/plugins/drupalpagebreak/fckplugin.js
@@ -121,7 +121,7 @@ FCKDrupalPageBreak.prototype.GetState = function()
 // Register the Drupal tag commands.
 FCKCommands.RegisterCommand( 'DrupalPageBreak', new FCKDrupalPageBreak( 'Break' ) ) ;
 // Create the Drupal tag buttons.
-var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', 'Break', null, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
+var oDrupalItem = new FCKToolbarButton( 'DrupalPageBreak', FCKLang.DrupalPageBreakTitle, FCKLang.DrupalPageBreakTooltip, FCK_TOOLBARITEM_ICONTEXT, true, true ) ;
 oDrupalItem.IconPath = FCKConfig.PluginsPath + 'drupalpagebreak/drupalpagebreak.gif';
 FCKToolbarItems.RegisterItem( 'DrupalPageBreak', oDrupalItem ) ;
 
diff --git a/plugins/drupalpagebreak/lang/en.js b/plugins/drupalpagebreak/lang/en.js
index a21c533de09f822a1f7625253bbbb474f53fcae0..0f47493530f6b75d1b558a4814fa3783369685d7 100644
--- a/plugins/drupalpagebreak/lang/en.js
+++ b/plugins/drupalpagebreak/lang/en.js
@@ -1 +1,2 @@
-FCKLang.DrupalBreakTitle			= 'Insert Teaser Break' ;
+FCKLang.DrupalPageBreakTooltip = 'Insert Page Break' ;
+FCKLang.DrupalPageBreakTitle = 'Page' ;
diff --git a/plugins/drupalpagebreak/lang/pl.js b/plugins/drupalpagebreak/lang/pl.js
new file mode 100644
index 0000000000000000000000000000000000000000..b006c87cf799f81bc885adecfa8a2c34e4737020
--- /dev/null
+++ b/plugins/drupalpagebreak/lang/pl.js
@@ -0,0 +1,2 @@
+FCKLang.DrupalPageBreakTooltip = 'Wstaw znacznik nowej strony' ;
+FCKLang.DrupalPageBreakTitle = 'Strona' ;