CMUCL commit: intl-branch src (4 files)

[Raymond Toy]

    Date: Monday, March 1, 2010 @ 19:39:17
  Author: rtoy
    Path: /project/cmucl/cvsroot/src
     Tag: intl-branch

Modified: code/macros.lisp code/room.lisp i18n/locale/cmucl.pot
          i18n/locale/ko/LC_MESSAGES/cmucl.po

code/macros.lisp:
code/room.lisp:
o Change some strings with ~P to call NGETTEXT so plurals can be
  translated correctly.

i18n/local/cmucl.pot:
o Regenerated.

i18n/locale/ko/LC_MESSAGES/cmucl.po:
o Re-merged.


-------------------------------------+
 code/macros.lisp                    |    8 +++++---
 code/room.lisp                      |   14 ++++++++++----
 i18n/locale/cmucl.pot               |   15 +++++++++------
 i18n/locale/ko/LC_MESSAGES/cmucl.po |   18 ++++++++++++------
 4 files changed, 36 insertions(+), 19 deletions(-)


Index: src/code/macros.lisp
diff -u src/code/macros.lisp:1.113.10.6 src/code/macros.lisp:1.113.10.7
--- src/code/macros.lisp:1.113.10.6	Sat Feb 13 12:10:09 2010
+++ src/code/macros.lisp	Mon Mar  1 19:39:16 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/macros.lisp,v 1.113.10.6 2010-02-13 17:10:09 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/macros.lisp,v 1.113.10.7 2010-03-02 00:39:16 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1490,8 +1490,10 @@
 (defun assert-report (names stream)
   (format stream _"Retry assertion")
   (if names
-      (format stream _" with new value~P for ~{~S~^, ~}."
-	      (length names) names)
+      (format stream (intl:ngettext " with new value for ~{~S~^, ~}."
+				    " with new values for ~{~S~^, ~}."
+				    (length names))
+	      names)
       (format stream ".")))
 
 (defun assert-prompt (name value)
Index: src/code/room.lisp
diff -u src/code/room.lisp:1.37.10.2 src/code/room.lisp:1.37.10.3
--- src/code/room.lisp:1.37.10.2	Tue Feb  9 21:22:09 2010
+++ src/code/room.lisp	Mon Mar  1 19:39:17 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/room.lisp,v 1.37.10.2 2010-02-10 02:22:09 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/room.lisp,v 1.37.10.3 2010-03-02 00:39:17 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -541,15 +541,21 @@
 	     (type memory-size total-bytes reported-bytes))
     (loop for (bytes objects name) in types do
       (when (<= bytes cutoff-point)
-	(format t _"  ~13:D bytes for ~9:D other object~2:*~P.~%"
+	(format t (intl:ngettext "  ~13:D bytes for ~9:D other object.~%"
+				 "  ~13:D bytes for ~9:D other objects.~%"
+				 (- total-objects reported-objects))
 		(- total-bytes reported-bytes)
 		(- total-objects reported-objects))
 	(return))
       (incf reported-bytes bytes)
       (incf reported-objects objects)
-      (format t _"  ~13:D bytes for ~9:D ~(~A~) object~2:*~P.~%"
+      (format t (intl:ngettext "  ~13:D bytes for ~9:D ~(~A~) object.~%"
+			       "  ~13:D bytes for ~9:D ~(~A~) objects.~%"
+			       objects)
 	      bytes objects name))
-    (format t _"  ~13:D bytes for ~9:D ~(~A~) object~2:*~P (space total.)~%"
+    (format t (intl:ngettext "  ~13:D bytes for ~9:D ~(~A~) object (space total.)~%"
+			     "  ~13:D bytes for ~9:D ~(~A~) objects (space total.)~%"
+			     total-objects)
 	    total-bytes total-objects (car space-total))))
 
 
Index: src/i18n/locale/cmucl.pot
diff -u src/i18n/locale/cmucl.pot:1.1.2.34 src/i18n/locale/cmucl.pot:1.1.2.35
--- src/i18n/locale/cmucl.pot:1.1.2.34	Fri Feb 26 18:44:45 2010
+++ src/i18n/locale/cmucl.pot	Mon Mar  1 19:39:17 2010
@@ -5776,16 +5776,19 @@
 msgstr ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D other object~2:*~P.~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D other object.~%"
+msgid_plural "  ~13:D bytes for ~9:D other objects.~%"
+msgstr[0] ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D ~(~A~) object~2:*~P.~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D ~(~A~) object.~%"
+msgid_plural "  ~13:D bytes for ~9:D ~(~A~) objects.~%"
+msgstr[0] ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D ~(~A~) object~2:*~P (space total.)~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D ~(~A~) object (space total.)~%"
+msgid_plural "  ~13:D bytes for ~9:D ~(~A~) objects (space total.)~%"
+msgstr[0] ""
 
 #: target:code/room.lisp
 msgid ""
Index: src/i18n/locale/ko/LC_MESSAGES/cmucl.po
diff -u src/i18n/locale/ko/LC_MESSAGES/cmucl.po:1.1.2.35 src/i18n/locale/ko/LC_MESSAGES/cmucl.po:1.1.2.36
--- src/i18n/locale/ko/LC_MESSAGES/cmucl.po:1.1.2.35	Fri Feb 26 18:44:46 2010
+++ src/i18n/locale/ko/LC_MESSAGES/cmucl.po	Mon Mar  1 19:39:17 2010
@@ -5774,16 +5774,22 @@
 msgstr ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D other object~2:*~P.~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D other object.~%"
+msgid_plural "  ~13:D bytes for ~9:D other objects.~%"
+msgstr[0] ""
+msgstr[1] ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D ~(~A~) object~2:*~P.~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D ~(~A~) object.~%"
+msgid_plural "  ~13:D bytes for ~9:D ~(~A~) objects.~%"
+msgstr[0] ""
+msgstr[1] ""
 
 #: target:code/room.lisp
-msgid "  ~13:D bytes for ~9:D ~(~A~) object~2:*~P (space total.)~%"
-msgstr ""
+msgid "  ~13:D bytes for ~9:D ~(~A~) object (space total.)~%"
+msgid_plural "  ~13:D bytes for ~9:D ~(~A~) objects (space total.)~%"
+msgstr[0] ""
+msgstr[1] ""
 
 #: target:code/room.lisp
 msgid ""