head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2;
locks; strict;
comment	@# @;


1.2
date	2005.10.07.09.42.23;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2005.06.25.12.11.25;	author rse;	state Exp;
branches;
next	;


desc
@@


1.2
log
@upgrading package: r 2.1.1 -> 2.2.0
@
text
@Index: src/main/errors.c
--- src/main/errors.c.orig	2005-06-12 10:47:32 +0200
+++ src/main/errors.c	2005-06-25 13:53:16 +0200
@@@@ -354,8 +354,12 @@@@
     cntxt.cend = &cleanup_PrintWarnings;
 
     inPrintWarnings = 1;
+#ifdef ENABLE_NLS
     header = ngettext("Warning message:\n", "Warning messages:\n", 
 		      R_CollectWarnings);
+#else
+    header = "Warning message:\n";
+#endif
     if( R_CollectWarnings == 1 ) {
 	REprintf(header);
 	names = CAR(ATTRIB(R_Warnings));
Index: src/main/util.c
--- src/main/util.c.orig	2005-06-12 10:47:32 +0200
+++ src/main/util.c	2005-06-25 13:54:52 +0200
@@@@ -803,9 +803,13 @@@@
 void checkArity(SEXP op, SEXP args)
 {
     if (PRIMARITY(op) >= 0 && PRIMARITY(op) != length(args))
+#ifdef ENABLE_NLS
 	error(ngettext("%d argument passed to '%s' which requires %d",
 		       "%d arguments passed to '%s' which requires %d",
 		       length(args)),
+#else
+	error("%d argument passed to '%s' which requires %d",
+#endif
 	      length(args), PRIMNAME(op), PRIMARITY(op));
 }
 
@


1.1
log
@upgrading package: r 2.0.1 -> 2.1.1
@
text
@@