Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.219
diff -u -p -r1.219 locale.inc
--- includes/locale.inc	8 Jun 2009 05:00:11 -0000	1.219
+++ includes/locale.inc	20 Jul 2009 08:06:39 -0000
@@ -1298,7 +1298,7 @@ function _locale_import_read_po($op, $fi
         $current = array();
       }
       elseif (!empty($current["msgctxt"])) { // Already in this context? Parse error
-        _locale_import_message('The translation file %filename contains an error: "msgctxt" is unexpected on line %line.', $file, lineno);
+        _locale_import_message('The translation file %filename contains an error: "msgctxt" is unexpected on line %line.', $file, $lineno);
         return FALSE;
       }
       $line = trim(substr($line, 7));
Index: modules/locale/locale.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v
retrieving revision 1.30
diff -u -p -r1.30 locale.test
--- modules/locale/locale.test	14 Jul 2009 10:22:17 -0000	1.30
+++ modules/locale/locale.test	20 Jul 2009 08:06:40 -0000
@@ -689,7 +689,7 @@ class LocaleImportFunctionalTest extends
     ));
 
     $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Long month name')), 'Svibanj', t('Long month name context is working.'));
-    $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Short month name')), 'Svi.', t('Short month name context is working.'));
+    $this->assertIdentical(t('May', array(), array('langcode' => 'hr')), 'Svi.', t('Default context is working.'));
   }
 
   /**
@@ -810,7 +810,6 @@ msgctxt "Long month name"
 msgid "May"
 msgstr "Svibanj"
 
-msgctxt "Short month name"
 msgid "May"
 msgstr "Svi."
 EOF;