Index: sfI18nModuleExtract.class.php
===================================================================
--- sfI18nModuleExtract.class.php	(.../trunk/lib/i18n/extract)	(revision 4366)
+++ sfI18nModuleExtract.class.php	(.../plugins/sfI18nExtractPlugin/lib)	(revision 4366)
@@ -30,7 +30,7 @@
 
     $this->module = $this->parameters['module'];
 
-    $this->i18n->setMessageSource(sfLoader::getI18NDirs($this->module), $this->culture);
+    $this->i18n->setMessageSourceDir(sfLoader::getI18NDir($this->module), $this->culture);
   }
 
   /**
Index: sfI18nExtract.class.php
===================================================================
--- sfI18nExtract.class.php	(.../trunk/lib/i18n/extract)	(revision 4366)
+++ sfI18nExtract.class.php	(.../plugins/sfI18nExtractPlugin/lib)	(revision 4366)
@@ -74,7 +74,7 @@
    */
   public function saveNewMessages()
   {
-    $messageSource = $this->i18n->getLastMessageSource();
+    $messageSource = $this->i18n->getGlobalMessageSource();
     foreach ($this->getNewMessages() as $message)
     {
       $messageSource->append($message);
@@ -91,7 +91,7 @@
    */
   public function deleteOldMessages()
   {
-    $messageSource = $this->i18n->getLastMessageSource();
+    $messageSource = $this->i18n->getGlobalMessageSource();
     foreach ($this->getOldMessages() as $message)
     {
       $messageSource->delete($message);
@@ -146,7 +146,7 @@
    */
   protected function loadMessageSources()
   {
-    foreach ($this->i18n->getMessageSources() as $messageSource)
+    foreach (array($this->i18n->getMessageSource(), $this->i18n->getGlobalMessageSource()) as $messageSource)
     {
       $messageSource->setCulture($this->culture);
       $messageSource->load();
@@ -159,7 +159,7 @@
   protected function loadCurrentMessages()
   {
     $this->currentMessages = array();
-    foreach ($this->i18n->getMessageSources() as $messageSource)
+    foreach (array($this->i18n->getMessageSource(), $this->i18n->getGlobalMessageSource()) as $messageSource)
     {
       foreach ($messageSource->read() as $catalogue => $translations)
       {