--- /potx/potx_old.inc	Mi ian. 26 14:16:06 2011
+++ /potx/potx.inc	Ma oct.  4 19:21:17 2011
@@ -343,7 +343,7 @@
         $output .= "msgid \"$singular\"\n";
         $output .= "msgid_plural \"$plural\"\n";
         if (isset($translation_export_langcode)) {
-          $output .= _potx_translation_export($translation_export_langcode, $singular, $plural, $api_version);
+          $output .= _potx_translation_export($translation_export_langcode, $singular, $plural, $api_version, $context);
         }
         else {
           $output .= "msgstr[0] \"\"\n";
@@ -357,7 +357,7 @@
         }
         $output .= "msgid \"$string\"\n";
         if (isset($translation_export_langcode)) {
-          $output .= _potx_translation_export($translation_export_langcode, $string, NULL, $api_version);
+          $output .= _potx_translation_export($translation_export_langcode, $string, NULL, $api_version, $context);
         }
         else {
           $output .= "msgstr \"\"\n";
@@ -396,7 +396,7 @@
  * @param $api_version
  *   Drupal API version to work with.
  */
-function _potx_translation_export($translation_export_langcode, $string, $plural = NULL, $api_version = POTX_API_CURRENT) {
+function _potx_translation_export($translation_export_langcode, $string, $plural = NULL, $api_version = POTX_API_CURRENT, $context = '') {
   include_once 'includes/locale.inc';
 
   // Stip out slash escapes.
@@ -408,7 +408,7 @@
 
   if (!isset($plural)) {
     // Single string to look translation up for.
-    if ($translation = db_query("SELECT t.translation FROM {locales_source} s LEFT JOIN {locales_target} t ON t.lid = s.lid WHERE s.source = :source AND t.{$language_column} = :langcode", array(':source' => $string, ':langcode' => $translation_export_langcode))->fetchField()) {
+    if ($translation = db_query("SELECT t.translation FROM {locales_source} s LEFT JOIN {locales_target} t ON t.lid = s.lid WHERE s.source = :source AND t.{$language_column} = :langcode AND context = :context", array(':source' => $string, ':langcode' => $translation_export_langcode, ':context' => $context))->fetchField()) {
       return 'msgstr '. _locale_export_string($translation);
     }
     return "msgstr \"\"\n";