# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1012366320 0
# Node ID 5d757d040a6a1073f704b2a20f9d0d93188a3002
# Parent  bd983bced1d34188d70158d45786764dbfb52635
[gaim-migrate @ 2956]
no more plural hacks

committer: Tailor Script <tailor@pidgin.im>

diff -r bd983bced1d3 -r 5d757d040a6a src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Wed Jan 30 04:39:34 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Jan 30 04:52:00 2002 +0000
@@ -1421,6 +1421,10 @@
 		args = va_arg(ap, struct aim_incomingim_ch2_args *);
 
 		ret = incomingim_chan2(sess, fr->conn, userinfo, args);
+	} else if (channel == 3) {
+		printf("Chan 3\n");
+	} else if (channel == 4) {
+		printf("Chan 4\n");
 	}
 
 	va_end(ap);
@@ -1456,45 +1460,49 @@
 			/* Message too large */
 			g_snprintf(buf,
 				   sizeof(buf),
-				   _("You missed %d message%s from %s because %s too large."),
+				   nummissed == 1 ?
+				   _("You missed %d message from %s because it was too large.") :
+				   _("You missed %s messages from %s because they were too large."),
 				   nummissed,
-				   nummissed == 1 ? "" : "s",
-				   userinfo->sn,
-				   nummissed == 1 ? "it was" : "they were");
+				   userinfo->sn);
 			break;
 		case 2:
 			/* Rate exceeded */
 			g_snprintf(buf,
 				   sizeof(buf),
-				   _("You missed %d message%s from %s because the rate limit has been exceeded."),
+				   nummissed == 1 ? 
+				   _("You missed %d message from %s because the rate limit has been exceeded.") :
+				   _("You missed %d messages from %s because the rate limit has been exceeded."),
 				   nummissed,
-				   nummissed == 1 ? "" : "s",
 				   userinfo->sn);
 			break;
 		case 3:
 			/* Evil Sender */
 			g_snprintf(buf,
 				   sizeof(buf),
-				   _("You missed %d message%s from %s because they are too evil."),
+				   nummissed == 1 ?
+				   _("You missed %d message from %s because they are too evil.") : 
+				   _("You missed %d messages from %s because they are too evil."),
 				   nummissed,
-				   nummissed == 1 ? "" : "s",
 				   userinfo->sn);
 			break;
 		case 4:
 			/* Evil Receiver */
 			g_snprintf(buf,
 				   sizeof(buf),
-				   _("You missed %d message%s from %s because you are too evil."),
+				   nummissed == 1 ? 
+				   _("You missed %d message from %s because you are too evil.") :
+				   _("You missed %d messages from %s because you are too evil."),
 				   nummissed,
-				   nummissed == 1 ? "" : "s",
 				   userinfo->sn);
 			break;
 		default:
 			g_snprintf(buf,
 				   sizeof(buf),
-				   _("You missed %d message%s from %s for unknown reasons."),
+				   nummissed == 1 ? 
+				   _("You missed %d message from %s for unknown reasons.") :
+				   _("You missed %d messages from %s for unknown reasons."),
 				   nummissed,
-				   nummissed == 1 ? "" : "s",
 				   userinfo->sn);
 			break;
 	}
diff -r bd983bced1d3 -r 5d757d040a6a src/protocols/toc/toc.c
--- a/src/protocols/toc/toc.c	Wed Jan 30 04:39:34 2002 +0000
+++ b/src/protocols/toc/toc.c	Wed Jan 30 04:52:00 2002 +0000
@@ -1940,8 +1940,11 @@
 			size /= 1024;
 			index++;
 		}
-	        g_snprintf(buf, sizeof(buf), _("%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"),
-				ft->user, ft->gc->username, ft->files, (ft->files == 1) ? "" : "s",
+	        g_snprintf(buf, sizeof(buf), 
+				ft->files == 1 ? 
+				_("%s requests %s to accept %d file: %s (%.2f %s)%s%s") :
+				_("%s requests %s to accept %d files: %s (%.2f %s)%s%s"),
+				ft->user, ft->gc->username, ft->files, 
 				ft->filename, size, sizes[index], (ft->message) ? "\n" : "",
 				(ft->message) ? ft->message : "");
 	} else {