Index: intltool-extract.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-extract.in.in,v
retrieving revision 1.57
diff -u -r1.57 intltool-extract.in.in
--- intltool-extract.in.in	6 May 2004 16:24:29 -0000	1.57
+++ intltool-extract.in.in	13 Jun 2004 12:42:19 -0000
@@ -277,8 +277,8 @@
             s/^ //;
             s/ $//;
         }
-        $messages{entity_decode_minimal($_)} = [];
-        $comments{entity_decode_minimal($_)} = $1 if (defined($1));
+        $messages{$_} = [];
+        $comments{$_} = $1 if (defined($1));
     }
 }
 
Index: tests/cases/merge6.po
===================================================================
RCS file: /cvs/gnome/intltool/tests/cases/merge6.po,v
retrieving revision 1.4
diff -u -r1.4 merge6.po
--- tests/cases/merge6.po	29 Oct 2001 19:07:04 -0000	1.4
+++ tests/cases/merge6.po	13 Jun 2004 12:42:20 -0000
@@ -15,7 +15,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: po/merge6.sheet.h:1
-msgid "This is a \" test"
+msgid "This is a &quot; test"
 msgstr "This is a \" test --> is this a success ?"
 
 #: po/merge6.sheet.h:2
Index: tests/results/extract7.xml.h
===================================================================
RCS file: /cvs/gnome/intltool/tests/results/extract7.xml.h,v
retrieving revision 1.3
diff -u -r1.3 extract7.xml.h
--- tests/results/extract7.xml.h	7 Mar 2002 14:35:11 -0000	1.3
+++ tests/results/extract7.xml.h	13 Jun 2004 12:42:20 -0000
@@ -3,7 +3,7 @@
 char *s = N_("Nearly all image operations are performed by right-clicking on the image. And don't worry, you can undo most mistakes...");
 char *s = N_("Not all effects can be applied to all kinds of images. This is indicated by a grayed-out menu-entry. You may need to change the image mode to RGB (Image-&gt;Mode-&gt;RGB), add an alpha-channel (Layers-&gt;Add Alpha Channel) or flatten it (Layers-&gt;Flatten Image).");
 char *s = N_("The GIMP uses layers to let you organize your image. Think of them as a stack of slides or filters, such that looking through them you see a composite of their contents.");
-char *s = N_("The layer named \"Background\" it special because it lacks transparency. This prevents you from adding a layer mask or moving the layer up in the stack. You may add transparency to it by right-clicking in the \"Layers, Channels and Paths\" dialog and selecting \"Add Alpha Channel\".");
+char *s = N_("The layer named &quot;Background&quot; it special because it lacks transparency. This prevents you from adding a layer mask or moving the layer up in the stack. You may add transparency to it by right-clicking in the &quot;Layers, Channels and Paths&quot; dialog and selecting &quot;Add Alpha Channel&quot;.");
 char *s = N_("When you save an image to work on it again later, try using XCF, the GIMP's native file format (use the file extension <tt>.xcf</tt>). This preserves the layers and every aspect of your work-in-progress. Once a project is completed, you can save it as JPEG, PNG, GIF, ...");
 char *s = N_("You can get context-sensitive help for most of the GIMP's features by pressing the F1 key at any time. This also works inside the menus.");
-char *s = N_("You can perform many layer operations by right-clicking on the text label of a layer in the \"Layers, Channels and Paths\" dialog.");
+char *s = N_("You can perform many layer operations by right-clicking on the text label of a layer in the &quot;Layers, Channels and Paths&quot; dialog.");
Index: tests/results/merge6.xml
===================================================================
RCS file: /cvs/gnome/intltool/tests/results/merge6.xml,v
retrieving revision 1.11
diff -u -r1.11 merge6.xml
--- tests/results/merge6.xml	22 Jan 2004 21:17:16 -0000	1.11
+++ tests/results/merge6.xml	13 Jun 2004 12:42:20 -0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <foo value-dash='testme' value="&lt;!DOCTYPE\ xbel" quotetest='a "quote" test' valuetesttwo="\177ELF            \004">
   <bar>This is a &quot; test</bar>
-  <bar xml:lang="merge6">This is a &quot; test --> is this a success ?</bar>
+  <bar xml:lang="merge6">This is a " test --> is this a success ?</bar>
   <bar>This is another ' test</bar>
-  <bar xml:lang="merge6">This is &apos; another \ test, and a \0123uccess.</bar>
+  <bar xml:lang="merge6">This is ' another \ test, and a \0123uccess.</bar>
 </foo>
