--- modules/locale.module-old	2004-04-10 20:48:50.000000000 +0200
+++ modules/locale.module	2004-04-10 20:47:37.000000000 +0200
@@ -315,9 +315,12 @@
         $parent[$child->lid]['comment'] = $child->location;
         $parent[$child->lid]['msgid'] = $child->source;
         if ($child->plid) {
-          $parent[$child->plid][$child->plural]['plural'] = $child->lid;
-          $parent[$child->plid][$child->plural]['translation'] = $child->translation;
-          $parent[$child->plid][$child->plural]['msgid'] = $child->source;
+          $parent[$child->lid][$child->plid]['plural'] = $child->lid;
+          $parent[$child->lid][$child->plid]['translation'] = $child->translation;
+          $parent[$child->lid][$child->plid]['msgid'] = $child->source;
+        }
+        else {
+          $parent[$child->lid]['translation'] = $child->translation;
         }
       }
       if ($edit['language']) {
@@ -364,6 +367,8 @@
       header("Content-Disposition: attachment; filename=$filename");
       header("Content-Type: text/plain; charset=utf-8");
 
+      print $header;
+
       foreach ($parent as $lid => $message) {
         if (!isset($done[$lid])) {
           if ($message['comment']) {