diff --git a/pcl/simple-streams/external-formats/ascii.lisp b/pcl/simple-streams/external-formats/ascii.lisp
index bf25a468074f330a9cb585c22f387419728e640f..b3c2cbe37c8dbde4248286ba51874c81a48abbd1 100644
--- a/pcl/simple-streams/external-formats/ascii.lisp
+++ b/pcl/simple-streams/external-formats/ascii.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/ascii.lisp,v 1.5 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/ascii.lisp,v 1.6 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (define-external-format :ascii (:size 1 :documentation 
 "US ASCII 7-bit encoding.  Illegal input sequences are replaced with
diff --git a/pcl/simple-streams/external-formats/beta-gk.lisp b/pcl/simple-streams/external-formats/beta-gk.lisp
index f12a3d465c666070dc018a8d6b42e38d3ea62cfc..e92345482bc27bcbbc235b7ddcedcb5d61bbc9d8 100644
--- a/pcl/simple-streams/external-formats/beta-gk.lisp
+++ b/pcl/simple-streams/external-formats/beta-gk.lisp
@@ -4,11 +4,14 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/beta-gk.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/beta-gk.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 ;; This is a composing format that translates (lower-case) Beta code
 ;; (an ASCII encoding of ancient Greek) into Unicode Greek.
 
+(in-package "STREAM")
+(intl:textdomain "cmucl")
+
 (defvar *betamap*
   '((109 956)
     ((102 966)
diff --git a/pcl/simple-streams/external-formats/cp1250.lisp b/pcl/simple-streams/external-formats/cp1250.lisp
index 3d795ecc438b6a151d93d9e83f57af26c28a0a47..960fb2f8fe760005bac598d998ee7cc500f68ca9 100644
--- a/pcl/simple-streams/external-formats/cp1250.lisp
+++ b/pcl/simple-streams/external-formats/cp1250.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1250.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1250.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See
 ;; http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
diff --git a/pcl/simple-streams/external-formats/cp1251.lisp b/pcl/simple-streams/external-formats/cp1251.lisp
index 782df2564db501d29f0b7329a31b3d069c3c005c..8f28e84f3686b8e3f824f5eca8c145227f5b6e6e 100644
--- a/pcl/simple-streams/external-formats/cp1251.lisp
+++ b/pcl/simple-streams/external-formats/cp1251.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1251.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1251.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1251.TXT
 
diff --git a/pcl/simple-streams/external-formats/cp1252.lisp b/pcl/simple-streams/external-formats/cp1252.lisp
index b7fc4f43341ada22fbee4948a9d63aeb9ce50247..889c14cba370727257041cb1138ca1a369fdec58 100644
--- a/pcl/simple-streams/external-formats/cp1252.lisp
+++ b/pcl/simple-streams/external-formats/cp1252.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1252.lisp,v 1.5 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1252.lisp,v 1.6 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT
 
diff --git a/pcl/simple-streams/external-formats/cp1253.lisp b/pcl/simple-streams/external-formats/cp1253.lisp
index 62ad03870575b98a9b8ae17b24864b0f51212e8b..023ad889a4acd06f27e9c63687bbbfd30dd5d1f8 100644
--- a/pcl/simple-streams/external-formats/cp1253.lisp
+++ b/pcl/simple-streams/external-formats/cp1253.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1253.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1253.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1253.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cp1254.lisp b/pcl/simple-streams/external-formats/cp1254.lisp
index 2afccb2d60d2f3e44c4f4e215b085afd052da6d5..cfbdc41e34b95c983d59d0d29b2867e487519c57 100644
--- a/pcl/simple-streams/external-formats/cp1254.lisp
+++ b/pcl/simple-streams/external-formats/cp1254.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1254.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1254.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1254.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cp1255.lisp b/pcl/simple-streams/external-formats/cp1255.lisp
index e257de40ae65d9911d38f21a2d8768c2fc3579ec..278d017eb6b24d89f14e24ba2362ee2787ebf060 100644
--- a/pcl/simple-streams/external-formats/cp1255.lisp
+++ b/pcl/simple-streams/external-formats/cp1255.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1255.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1255.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1255.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cp1256.lisp b/pcl/simple-streams/external-formats/cp1256.lisp
index ff18ea25d3b0895c39de01ff4ed9824b3db25f09..13e3b3ae8f89f8ab931292146637f5ca69ef2bd9 100644
--- a/pcl/simple-streams/external-formats/cp1256.lisp
+++ b/pcl/simple-streams/external-formats/cp1256.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1256.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1256.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1256.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cp1257.lisp b/pcl/simple-streams/external-formats/cp1257.lisp
index 40c5c39433cbbd270dc57094ed571bdf9f61443f..d025bf51efdab39451ab24848f01baa1b872b265 100644
--- a/pcl/simple-streams/external-formats/cp1257.lisp
+++ b/pcl/simple-streams/external-formats/cp1257.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1257.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1257.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cp1258.lisp b/pcl/simple-streams/external-formats/cp1258.lisp
index 26a8d93a345529e3634c30a8ae9fa7c397b5dc53..b6927d015a68bbf0f0450cf47f0a87b8f345d3e5 100644
--- a/pcl/simple-streams/external-formats/cp1258.lisp
+++ b/pcl/simple-streams/external-formats/cp1258.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1258.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cp1258.lisp,v 1.5 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1258.TXT
 ;;
diff --git a/pcl/simple-streams/external-formats/cr.lisp b/pcl/simple-streams/external-formats/cr.lisp
index 4c7796aee23d2c55c6803a95b90232f836e7518e..be2b3589b35280de6e887d0c9c1bb07d0a682a90 100644
--- a/pcl/simple-streams/external-formats/cr.lisp
+++ b/pcl/simple-streams/external-formats/cr.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cr.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/cr.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; Convert CR to/from #\newline.
 (define-composing-external-format :cr (:size 1 :documentation
diff --git a/pcl/simple-streams/external-formats/crlf.lisp b/pcl/simple-streams/external-formats/crlf.lisp
index ce0c7f3b41dc80c17cdbf11e1f689a03daba75dd..e2bc9ed7de9a8b5f48b43d13cc653e447945be81 100644
--- a/pcl/simple-streams/external-formats/crlf.lisp
+++ b/pcl/simple-streams/external-formats/crlf.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/crlf.lisp,v 1.4 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/crlf.lisp,v 1.5 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; Convert DOS cr/lf end-of-line sequence to/from #\newline
 (define-composing-external-format :crlf (:max 2 :documentation
diff --git a/pcl/simple-streams/external-formats/final-sigma.lisp b/pcl/simple-streams/external-formats/final-sigma.lisp
index de04cbf049c08b6d43fb3278af47f42bc18e9797..0c0df3d5ac2188dc92c4032dc90b8d5a34549391 100644
--- a/pcl/simple-streams/external-formats/final-sigma.lisp
+++ b/pcl/simple-streams/external-formats/final-sigma.lisp
@@ -4,7 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/final-sigma.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/final-sigma.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
+
+(in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; This is a composing format that attempts to detect sigma in
 ;; word-final position and change it from "σ" (U+03C3) to "ς" (U+03C2).
diff --git a/pcl/simple-streams/external-formats/iso8859-1.lisp b/pcl/simple-streams/external-formats/iso8859-1.lisp
index 974e3a336ca61dae5bfb453f26475c5f29941e52..70f3deb46d218f8602c5750fd30b383e455795d3 100644
--- a/pcl/simple-streams/external-formats/iso8859-1.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-1.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-1.lisp,v 1.5 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-1.lisp,v 1.6 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; This is actually implemented in the external-formats code
 ;; It appears here only for reference, and will never get loaded
diff --git a/pcl/simple-streams/external-formats/iso8859-10.lisp b/pcl/simple-streams/external-formats/iso8859-10.lisp
index 1980229052e216b6f81dbbe89c7d5b8980d832fe..899cc8ba1d0d0b49866ce761471fde7b89befdc8 100644
--- a/pcl/simple-streams/external-formats/iso8859-10.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-10.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-10.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-10.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-10+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-13.lisp b/pcl/simple-streams/external-formats/iso8859-13.lisp
index 8d5f58b56483dd59bbde63182af1aa4507467e30..a36a0ff177fe452e003f1185d03baef12983d96a 100644
--- a/pcl/simple-streams/external-formats/iso8859-13.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-13.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-13.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-13.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-13+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-14.lisp b/pcl/simple-streams/external-formats/iso8859-14.lisp
index af0cabb1fb973f891999fce767a40888b57b6dcc..5ca2640e8bea8a9a169dd3d9bc57eaa8582bc94b 100644
--- a/pcl/simple-streams/external-formats/iso8859-14.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-14.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-14.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-14.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-14+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-15.lisp b/pcl/simple-streams/external-formats/iso8859-15.lisp
index 63f916628a89c507b5718eb351dac5115de28844..1135d9ac5f5b2f639b65efbce311263bf753f474 100644
--- a/pcl/simple-streams/external-formats/iso8859-15.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-15.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-15.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-15.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-15+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-2.lisp b/pcl/simple-streams/external-formats/iso8859-2.lisp
index db550c3e433f0d0ab7ceb2ca1a14ad4b8606ff16..4c410183989bc8674f6bcb7a8b71bc2dc5facb99 100644
--- a/pcl/simple-streams/external-formats/iso8859-2.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-2.lisp
@@ -4,9 +4,11 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-2.lisp,v 1.6 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-2.lisp,v 1.7 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
+
 
 (defconstant +iso-8859-2+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-3.lisp b/pcl/simple-streams/external-formats/iso8859-3.lisp
index 2a85ed0579a42b6c7a55bdb92e896b00de82235c..26e79a5b0d5f1b552fa2703041aa2e296b3ad949 100644
--- a/pcl/simple-streams/external-formats/iso8859-3.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-3.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-3.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-3.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-3+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-4.lisp b/pcl/simple-streams/external-formats/iso8859-4.lisp
index d58d83b62ad6c9ce8426f544d94f91cc70fe55ac..7625426c35707fab5d8c8ea9f4e5c5e786c0e8da 100644
--- a/pcl/simple-streams/external-formats/iso8859-4.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-4.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-4.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-4.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-4+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-5.lisp b/pcl/simple-streams/external-formats/iso8859-5.lisp
index 226ed5d4f042c1b4b100436702fc02ba0690e5ed..e1787eaa98a57bcc3d59897650f4493ee8889a48 100644
--- a/pcl/simple-streams/external-formats/iso8859-5.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-5.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-5.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-5.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-5+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-6.lisp b/pcl/simple-streams/external-formats/iso8859-6.lisp
index 2d68399fc611b0e385754e0deeceaeb0294d504d..afcc6fdaa10014b67f0d0c3d0959b28d1421a82b 100644
--- a/pcl/simple-streams/external-formats/iso8859-6.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-6.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-6.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-6.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-6+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-7.lisp b/pcl/simple-streams/external-formats/iso8859-7.lisp
index d9718e47f7484a62bebc0e37080a8622e55ba679..a5bc07db8ea6e73cf4a243fe0e53758339e8b68e 100644
--- a/pcl/simple-streams/external-formats/iso8859-7.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-7.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-7.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-7.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-7+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-8.lisp b/pcl/simple-streams/external-formats/iso8859-8.lisp
index 395c8f99890ab4a7901ebdec5c65727ce63635a5..e08087a78a4416ee1e47969fae07aa3e4c476235 100644
--- a/pcl/simple-streams/external-formats/iso8859-8.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-8.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-8.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-8.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-8+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/iso8859-9.lisp b/pcl/simple-streams/external-formats/iso8859-9.lisp
index 7da494dea8328c3f020c3e6625fafc248f78388d..d165503d28c7ccdb40efdffb0042348fb31c77a8 100644
--- a/pcl/simple-streams/external-formats/iso8859-9.lisp
+++ b/pcl/simple-streams/external-formats/iso8859-9.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-9.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/iso8859-9.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +iso-8859-9+
   (make-array 96 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/koi8-r.lisp b/pcl/simple-streams/external-formats/koi8-r.lisp
index 09fa9503e9c1e80ea371229f4c943aecc9ad0a63..1360a5e916dd50beb27d11552dda5c03e28ec927 100644
--- a/pcl/simple-streams/external-formats/koi8-r.lisp
+++ b/pcl/simple-streams/external-formats/koi8-r.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/koi8-r.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/koi8-r.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +koi8-r+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/mac-cyrillic.lisp b/pcl/simple-streams/external-formats/mac-cyrillic.lisp
index 91e4cd4f4f6878e242f523dfc532b17350e2ceef..ef52085c836c4d8b79ac31b470a9b87554e0a31e 100644
--- a/pcl/simple-streams/external-formats/mac-cyrillic.lisp
+++ b/pcl/simple-streams/external-formats/mac-cyrillic.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-cyrillic.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-cyrillic.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +mac-cyrillic+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/mac-greek.lisp b/pcl/simple-streams/external-formats/mac-greek.lisp
index 44d7fe06217ac812a28869b442b9b4c064bb7c25..f45ff77eb0aa8a9839ca899b00a6012761f3840e 100644
--- a/pcl/simple-streams/external-formats/mac-greek.lisp
+++ b/pcl/simple-streams/external-formats/mac-greek.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-greek.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-greek.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +mac-greek+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/mac-icelandic.lisp b/pcl/simple-streams/external-formats/mac-icelandic.lisp
index 89ef6999b9c06b7af4489d373de30cfe19d1435a..7cb397f0dd5ae0652627d37cf1ea3b458af2c2ce 100644
--- a/pcl/simple-streams/external-formats/mac-icelandic.lisp
+++ b/pcl/simple-streams/external-formats/mac-icelandic.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-icelandic.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-icelandic.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +mac-icelandic+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/mac-latin2.lisp b/pcl/simple-streams/external-formats/mac-latin2.lisp
index ece9e08e57d35be8092992bd188bd0dd9eef41ab..a4640a7cc53f80525d070adb666ff29064837657 100644
--- a/pcl/simple-streams/external-formats/mac-latin2.lisp
+++ b/pcl/simple-streams/external-formats/mac-latin2.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-latin2.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-latin2.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +mac-latin2+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/mac-roman.lisp b/pcl/simple-streams/external-formats/mac-roman.lisp
index 59519d111538203c0dd21e4144267c6f637a95af..9e3bc1aa1c4e8e0d370ce11124d82637f57838c6 100644
--- a/pcl/simple-streams/external-formats/mac-roman.lisp
+++ b/pcl/simple-streams/external-formats/mac-roman.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-roman.lisp,v 1.7 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-roman.lisp,v 1.8 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; See http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT.  We
 ;; only need the entries from 128 to 255.
diff --git a/pcl/simple-streams/external-formats/mac-turkish.lisp b/pcl/simple-streams/external-formats/mac-turkish.lisp
index a5e73306df912fd670a79aa5b664cfa55706e068..aa35b051e5b9318762434889512159f58e91c12d 100644
--- a/pcl/simple-streams/external-formats/mac-turkish.lisp
+++ b/pcl/simple-streams/external-formats/mac-turkish.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-turkish.lisp,v 1.3 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/mac-turkish.lisp,v 1.4 2010/07/12 14:42:11 rtoy Rel $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (defconstant +mac-turkish+
   (make-array 128 :element-type '(unsigned-byte 16)
diff --git a/pcl/simple-streams/external-formats/utf-16-be.lisp b/pcl/simple-streams/external-formats/utf-16-be.lisp
index a83f007576fcf606226860d8fd97d0f278a26fd1..2c94b9279cd020be9f76705dc38be666e8ffc1f5 100644
--- a/pcl/simple-streams/external-formats/utf-16-be.lisp
+++ b/pcl/simple-streams/external-formats/utf-16-be.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.9 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-be.lisp,v 1.10 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; UTF-16BE.  BOM is not recognized and is never output.
 
diff --git a/pcl/simple-streams/external-formats/utf-16-le.lisp b/pcl/simple-streams/external-formats/utf-16-le.lisp
index 6c74e66d153fa9a4ecef750690b10cf432f57803..a238518332fdea1bd669d31dc3662b14ce44de12 100644
--- a/pcl/simple-streams/external-formats/utf-16-le.lisp
+++ b/pcl/simple-streams/external-formats/utf-16-le.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.9 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16-le.lisp,v 1.10 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; UTF-16LE.  BOM is not recognized, and is never output.
 ;;
diff --git a/pcl/simple-streams/external-formats/utf-16.lisp b/pcl/simple-streams/external-formats/utf-16.lisp
index b541af12520e4ad441f87ce530fd12827bd258a7..ed69a256fb42ee0e2ca64791902cea84dd49d5b6 100644
--- a/pcl/simple-streams/external-formats/utf-16.lisp
+++ b/pcl/simple-streams/external-formats/utf-16.lisp
@@ -1,9 +1,10 @@
 ;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Package: STREAM -*-
 ;;;
 ;;; **********************************************************************
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16.lisp,v 1.11 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-16.lisp,v 1.12 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; From the Unicode BOM FAQ
 ;; (http://www.unicode.org/faq/utf_bom.html#BOM), UTF-16BE and
diff --git a/pcl/simple-streams/external-formats/utf-32-be.lisp b/pcl/simple-streams/external-formats/utf-32-be.lisp
index 46c53ed89bed4b643358a768de0b8352c6b13eb2..3a8f6f1aff78e3bc691da174d378c54d02595598 100644
--- a/pcl/simple-streams/external-formats/utf-32-be.lisp
+++ b/pcl/simple-streams/external-formats/utf-32-be.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32-be.lisp,v 1.8 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32-be.lisp,v 1.9 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (define-external-format :utf-32-be (:size 4 :documentation
 "UTF-32-BE is a fixed-length character encoding of 4 octets for
diff --git a/pcl/simple-streams/external-formats/utf-32-le.lisp b/pcl/simple-streams/external-formats/utf-32-le.lisp
index 21c3d93b614bd26b4a9d59edbf521e6745a4c554..a6e6ea0aa4ed096b5ddc8e29d3a988cd84fe0739 100644
--- a/pcl/simple-streams/external-formats/utf-32-le.lisp
+++ b/pcl/simple-streams/external-formats/utf-32-le.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32-le.lisp,v 1.8 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32-le.lisp,v 1.9 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 (define-external-format :utf-32-le (:size 4 :documentation
 "UTF-32-LE is a fixed-length character encoding of 4 octets for
diff --git a/pcl/simple-streams/external-formats/utf-32.lisp b/pcl/simple-streams/external-formats/utf-32.lisp
index 0fd041a8821d487271cc9a3a6242cf341dc84ce5..e0f00ab8ade284398b5882a1e594339f5de40b28 100644
--- a/pcl/simple-streams/external-formats/utf-32.lisp
+++ b/pcl/simple-streams/external-formats/utf-32.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Raymond Toy and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32.lisp,v 1.10 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-32.lisp,v 1.11 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; UTF-32, with unspecified endianness.  We default to big-endian (as
 ;; specified), but we do recognize the BOM to specify endianness.  We
diff --git a/pcl/simple-streams/external-formats/utf-8.lisp b/pcl/simple-streams/external-formats/utf-8.lisp
index 0f670cb3f06f51776d8d1d64a8adac57d1821e92..d95f1f6523ef73de4aec433d983560c73d795d0c 100644
--- a/pcl/simple-streams/external-formats/utf-8.lisp
+++ b/pcl/simple-streams/external-formats/utf-8.lisp
@@ -4,9 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-8.lisp,v 1.13 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/utf-8.lisp,v 1.14 2010/07/12 14:42:11 rtoy Exp $")
 
 (in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; A safe UTF-8 external format.  Any illegal UTF-8 sequences on input
 ;; are replaced with the Unicode REPLACEMENT CHARACTER (U+FFFD).
diff --git a/pcl/simple-streams/external-formats/void.lisp b/pcl/simple-streams/external-formats/void.lisp
index 9cdc3bbef769652d5a9b44eb57ce291f765ea96d..c2660166973b9c3186169207762298acceb7250c 100644
--- a/pcl/simple-streams/external-formats/void.lisp
+++ b/pcl/simple-streams/external-formats/void.lisp
@@ -4,7 +4,10 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/void.lisp,v 1.5 2010/07/12 13:58:42 rtoy Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/simple-streams/external-formats/void.lisp,v 1.6 2010/07/12 14:42:11 rtoy Rel $")
+
+(in-package "STREAM")
+(intl:textdomain "cmucl")
 
 ;; This is actually implemented in the external-formats code
 ;; It appears here only for reference, and will never get loaded
diff --git a/tools/build-world.sh b/tools/build-world.sh
index 7fd3f54bfc8ca312eac4993f27fed19e14c16624..f354915ac60bb6be2b60451a6a7e8a194b7bfd7b 100755
--- a/tools/build-world.sh
+++ b/tools/build-world.sh
@@ -22,6 +22,7 @@ else
 fi
 
 if [ -n "$MAKE_POT" ]; then
+    GETFMT="(map nil #'(lambda (f) (stream::find-external-format (car f))) (list-all-external-formats))"
     SAVEPOT='(intl::dump-pot-files :output-directory "default:src/i18n/locale/")'
 fi
 
@@ -61,6 +62,7 @@ $LISP "$@" -noinit -nositeinit <<EOF
 #+(or no-compiler runtime) (comf "target:compiler/generic/new-genesis")
 #-(or no-pcl runtime) (load "target:tools/pclcom")
 
+$GETFMT
 $SAVEPOT
 
 (setq *gc-verbose* t *interactive* t)