1. clamav-devel
  2. Commit 27395a6e657459f2c346e21795d8397424dd4ba9
Browse code

URL changes from Luca

git-svn: trunk@2724

Nigel Horne authored on 2007/02/13 07:26:08
Showing 6 changed files
clamav-devel/ChangeLog
History View file @ 27395a6
... ... 
@@ -1,3 +1,7 @@
1 
+Mon Feb 12 22:25:30 GMT 2007 (njh)
2 
+----------------------------------
3 
+  *	Changed some URLs, patch from Luca
4 
+
1 5 
 Mon Feb 12 21:15:00 GMT 2007 (njh)
2 6 
 ----------------------------------
3 7 
   * libclamav/entconv.c:	Code tidy for bounds checking compilers
clamav-devel/clamav-milter/clamav-milter.c
History View file @ 27395a6
... ... 
@@ -24,7 +24,7 @@
24 24 
  *
25 25 
  * For installation instructions see the file INSTALL that came with this file
26 26 
  */
27 
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.311 2007/02/12 15:01:50 njh Exp $";
27 
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 njh Exp $";
28 28
29 29 
 #define	CM_VERSION	"devel-120207"
30 30
... ... 
@@ -244,7 +244,6 @@ struct	privdata {
244 244 
 	long	numBytes;	/* Number of bytes sent so far */
245 245 
 	char	*received;	/* keep track of received from */
246 246 
 	const	char	*rejectCode;	/* 550 or 554? */
247 
-	char	*messageID;	/* sendmailID */
248 247 
 	int	discard;	/*
249 248 
 				 * looks like the remote end is playing ping
250 249 
 				 * pong with us
... ... 
@@ -593,7 +592,7 @@ help(void)
593 593 
 	puts(_("\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."));
594 594 
 #endif
595 595 
 	puts(_("\nFor more information type \"man clamav-milter\"."));
596 
-	puts(_("For bug reports, please refer to http://www.clamav.net/bugs.html#pagestart"));
596 
+	puts(_("For bug reports, please refer to http://www.clamav.net/bugs"));
597 597 
 }
598 598
599 599 
 int
... ... 
@@ -621,12 +620,12 @@ main(int argc, char **argv)
621 621 
 #endif
622 622 
 		clamfi_envfrom, /* envelope sender filter callback */
623 623 
 		clamfi_envrcpt, /* envelope recipient filter callback */
624 
-		clamfi_header, /* header filter callback */
625 
-		clamfi_eoh, /* end of header callback */
626 
-		clamfi_body, /* body filter callback */
627 
-		clamfi_eom, /* end of message callback */
628 
-		clamfi_abort, /* message aborted callback */
629 
-		clamfi_close, /* connection cleanup callback */
624 
+		clamfi_header,	/* header filter callback */
625 
+		clamfi_eoh,	/* end of header callback */
626 
+		clamfi_body,	/* body filter callback */
627 
+		clamfi_eom,	/* end of message callback */
628 
+		clamfi_abort,	/* message aborted callback */
629 
+		clamfi_close,	/* connection cleanup callback */
630 630 
 	};
631 631
632 632 
 #if defined(CL_DEBUG) && defined(C_LINUX)
clamav-devel/clamav-milter/clamav-milter.po
History View file @ 27395a6
... ... 
@@ -8,7 +8,7 @@ msgid ""
8 8 
 msgstr ""
9 9 
 "Project-Id-Version: PACKAGE VERSION\n"
10 10 
 "Report-Msgid-Bugs-To: bugs@clamav.net\n"
11 
-"POT-Creation-Date: 2006-08-03 09:29+0100\n"
11 
+"POT-Creation-Date: 2007-02-12 22:24+0000\n"
12 12 
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 
 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... 
@@ -16,806 +16,783 @@ msgstr ""
16 16 
 "Content-Type: text/plain; charset=CHARSET\n"
17 17 
 "Content-Transfer-Encoding: 8bit\n"
18 18
19 
-#: clamav-milter.c:536
19 
+#: clamav-milter.c:550
20 20 
 msgid "\t--advisory\t\t-A\tFlag viruses rather than deleting them."
21 21 
 msgstr ""
22 22
23 
-#: clamav-milter.c:537
23 
+#: clamav-milter.c:551
24 24 
 msgid "\t--blacklist=time\t-k\tTime (in seconds) to blacklist an IP."
25 25 
 msgstr ""
26 26
27 
-#: clamav-milter.c:538
27 
+#: clamav-milter.c:552
28 28 
 msgid "\t--black-hole-mode\t\tDon't scan messages aliased to /dev/null."
29 29 
 msgstr ""
30 30
31 
-#: clamav-milter.c:539
31 
+#: clamav-milter.c:554
32 32 
 msgid "\t--bounce\t\t-b\tSend a failure message to the sender."
33 33 
 msgstr ""
34 34
35 
-#: clamav-milter.c:540
35 
+#: clamav-milter.c:556
36 36 
 msgid ""
37 37 
 "\t--broadcast\t\t-B [IFACE]\tBroadcast to a network manager when a virus is "
38 38 
 "found."
39 39 
 msgstr ""
40 40
41 
-#: clamav-milter.c:541
41 
+#: clamav-milter.c:557
42 42 
 msgid "\t--config-file=FILE\t-c FILE\tRead configuration from FILE."
43 43 
 msgstr ""
44 44
45 
-#: clamav-milter.c:542
45 
+#: clamav-milter.c:558
46 46 
 msgid "\t--debug\t\t\t-D\tPrint debug messages."
47 47 
 msgstr ""
48 48
49 
-#: clamav-milter.c:543
49 
+#: clamav-milter.c:559
50 50 
 msgid ""
51 51 
 "\t--detect-forged-local-address\t-L\tReject mails that claim to be from us."
52 52 
 msgstr ""
53 53
54 
-#: clamav-milter.c:544
54 
+#: clamav-milter.c:560
55 
+msgid "\t--dont-blacklist\t-K\tDon't blacklist a given IP."
56 
+msgstr ""
57 
+
58 
+#: clamav-milter.c:561
55 59 
 msgid ""
56 60 
 "\t--dont-scan-on-error\t-d\tPass e-mails through unscanned if a system error "
57 61 
 "occurs."
58 62 
 msgstr ""
59 63
60 
-#: clamav-milter.c:545
64 
+#: clamav-milter.c:562
61 65 
 msgid "\t--dont-wait\t\t\tAsk remote end to resend if max-children exceeded."
62 66 
 msgstr ""
63 67
64 
-#: clamav-milter.c:546
68 
+#: clamav-milter.c:563
65 69 
 msgid "\t--external\t\t-e\tUse an external scanner (usually clamd)."
66 70 
 msgstr ""
67 71
68 
-#: clamav-milter.c:547
72 
+#: clamav-milter.c:564
69 73 
 msgid ""
70 74 
 "\t--freshclam-monitor=SECS\t-M SECS\tHow often to check for database update."
71 75 
 msgstr ""
72 76
73 
-#: clamav-milter.c:548
77 
+#: clamav-milter.c:565
74 78 
 msgid "\t--from=EMAIL\t\t-a EMAIL\tError messages come from here."
75 79 
 msgstr ""
76 80
77 
-#: clamav-milter.c:549
81 
+#: clamav-milter.c:566
78 82 
 msgid "\t--force-scan\t\t-f\tForce scan all messages (overrides (-o and -l)."
79 83 
 msgstr ""
80 84
81 
-#: clamav-milter.c:550
85 
+#: clamav-milter.c:567
82 86 
 msgid "\t--help\t\t\t-h\tThis message."
83 87 
 msgstr ""
84 88
85 
-#: clamav-milter.c:551
89 
+#: clamav-milter.c:568
86 90 
 msgid "\t--headers\t\t-H\tInclude original message headers in the report."
87 91 
 msgstr ""
88 92
89 
-#: clamav-milter.c:552
93 
+#: clamav-milter.c:569
90 94 
 msgid ""
91 95 
 "\t--ignore IPaddr\t\t-I IPaddr\tAdd IPaddr to LAN IP list (see --local)."
92 96 
 msgstr ""
93 97
94 
-#: clamav-milter.c:553
98 
+#: clamav-milter.c:570
95 99 
 msgid "\t--local\t\t\t-l\tScan messages sent from machines on our LAN."
96 100 
 msgstr ""
97 101
98 
-#: clamav-milter.c:554
102 
+#: clamav-milter.c:571
99 103 
 msgid "\t--max-childen\t\t-m\tMaximum number of concurrent scans."
100 104 
 msgstr ""
101 105
102 
-#: clamav-milter.c:555
106 
+#: clamav-milter.c:572
103 107 
 msgid "\t--outgoing\t\t-o\tScan outgoing messages from this machine."
104 108 
 msgstr ""
105 109
106 
-#: clamav-milter.c:556
110 
+#: clamav-milter.c:573
107 111 
 msgid "\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."
108 112 
 msgstr ""
109 113
110 
-#: clamav-milter.c:557
114 
+#: clamav-milter.c:574
111 115 
 msgid "\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."
112 116 
 msgstr ""
113 117
114 
-#: clamav-milter.c:558
118 
+#: clamav-milter.c:575
115 119 
 msgid "\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."
116 120 
 msgstr ""
117 121
118 
-#: clamav-milter.c:559
122 
+#: clamav-milter.c:576
119 123 
 msgid "\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."
120 124 
 msgstr ""
121 125
122 
-#: clamav-milter.c:560
123 
-msgid "\t--postmaster-only\t-P\tSend warnings only to the postmaster."
126 
+#: clamav-milter.c:577
127 
+msgid "\t--postmaster-only\t-P\tSend notifications only to the postmaster."
124 128 
 msgstr ""
125 129
126 
-#: clamav-milter.c:561
130 
+#: clamav-milter.c:578
127 131 
 msgid "\t--quiet\t\t\t-q\tDon't send e-mail notifications of interceptions."
128 132 
 msgstr ""
129 133
130 
-#: clamav-milter.c:562
134 
+#: clamav-milter.c:579
131 135 
 msgid "\t--quarantine=USER\t-Q EMAIL\tQuarantine e-mail account."
132 136 
 msgstr ""
133 137
134 
-#: clamav-milter.c:563
138 
+#: clamav-milter.c:580
135 139 
 msgid "\t--report-phish=EMAIL\t-r EMAIL\tReport phish to this email address."
136 140 
 msgstr ""
137 141
138 
-#: clamav-milter.c:564
142 
+#: clamav-milter.c:581
139 143 
 msgid "\t--quarantine-dir=DIR\t-U DIR\tDirectory to store infected emails."
140 144 
 msgstr ""
141 145
142 
-#: clamav-milter.c:565
146 
+#: clamav-milter.c:582
143 147 
 msgid ""
144 148 
 "\t--server=SERVER\t\t-s SERVER\tHostname/IP address of server(s) running "
145 149 
 "clamd (when using TCPsocket)."
146 150 
 msgstr ""
147 151
148 
-#: clamav-milter.c:566
152 
+#: clamav-milter.c:583
149 153 
 msgid "\t--sendmail-cf=FILE\t\tLocation of the sendmail.cf file to verify"
150 154 
 msgstr ""
151 155
152 
-#: clamav-milter.c:567
156 
+#: clamav-milter.c:584
153 157 
 msgid "\t--sign\t\t\t-S\tAdd a hard-coded signature to each scanned message."
154 158 
 msgstr ""
155 159
156 
-#: clamav-milter.c:568
160 
+#: clamav-milter.c:585
157 161 
 msgid "\t--signature-file=FILE\t-F FILE\tLocation of signature file."
158 162 
 msgstr ""
159 163
160 
-#: clamav-milter.c:569
164 
+#: clamav-milter.c:586
161 165 
 msgid "\t--template-file=FILE\t-t FILE\tLocation of e-mail template file."
162 166 
 msgstr ""
163 167
164 
-#: clamav-milter.c:570
168 
+#: clamav-milter.c:587
165 169 
 msgid ""
166 170 
 "\t--template-headers=FILE\t\tLocation of e-mail headers for template file."
167 171 
 msgstr ""
168 172
169 
-#: clamav-milter.c:571
173 
+#: clamav-milter.c:588
170 174 
 msgid "\t--timeout=SECS\t\t-T SECS\tTimeout waiting to childen to die."
171 175 
 msgstr ""
172 176
173 
-#: clamav-milter.c:572
177 
+#: clamav-milter.c:589
174 178 
 msgid ""
175 179 
 "\t--whitelist-file=FILE\t-W FILE\tLocation of the file of whitelisted "
176 180 
 "addresses"
177 181 
 msgstr ""
178 182
179 
-#: clamav-milter.c:573
183 
+#: clamav-milter.c:590
180 184 
 msgid "\t--version\t\t-V\tPrint the version number of this software."
181 185 
 msgstr ""
182 186
183 
-#: clamav-milter.c:575
187 
+#: clamav-milter.c:592
184 188 
 msgid "\t--debug-level=n\t\t-x n\tSets the debug level to 'n'."
185 189 
 msgstr ""
186 190
187 
-#: clamav-milter.c:577
191 
+#: clamav-milter.c:594
188 192 
 msgid ""
189 193 
 "\n"
190 194 
 "For more information type \"man clamav-milter\"."
191 195 
 msgstr ""
192 196
193 
-#: clamav-milter.c:578
194 
-msgid ""
195 
-"For bug reports, please refer to http://www.clamav.net/bugs.html#pagestart"
197 
+#: clamav-milter.c:595
198 
+msgid "For bug reports, please refer to http://www.clamav.net/bugs"
196 199 
 msgstr ""
197 200
198 
-#: clamav-milter.c:836
201 
+#: clamav-milter.c:872
199 202 
 #, c-format
200 203 
 msgid "%s: %s, -I may only be given once"
201 204 
 msgstr ""
202 205
203 
-#: clamav-milter.c:842
206 
+#: clamav-milter.c:878
204 207 
 #, c-format
205 208 
 msgid "%s: Cannot convert -I%s to IPaddr"
206 209 
 msgstr ""
207 210
208 
-#: clamav-milter.c:959
211 
+#: clamav-milter.c:994
212 
+#, c-format
213 
+msgid "%s: SESSIONS mode requires --external\n"
214 
+msgstr ""
215 
+
216 
+#: clamav-milter.c:1002
209 217 
 #, c-format
210 218 
 msgid "%s: No socket-addr given\n"
211 219 
 msgstr ""
212 220
213 
-#: clamav-milter.c:965
221 
+#: clamav-milter.c:1008
214 222 
 #, c-format
215 223 
 msgid "%s: socket-addr (%s) doesn't agree with sendmail.cf\n"
216 224 
 msgstr ""
217 225
218 
-#: clamav-milter.c:980
226 
+#: clamav-milter.c:1023
219 227 
 #, c-format
220 228 
 msgid "%s: when using inet: connection to sendmail you must enable --local\n"
221 229 
 msgstr ""
222 230
223 
-#: clamav-milter.c:992
231 
+#: clamav-milter.c:1035
224 232 
 #, c-format
225 233 
 msgid "%s: Can't parse the config file %s\n"
226 234 
 msgstr ""
227 235
228 
-#: clamav-milter.c:999
236 
+#: clamav-milter.c:1042
229 237 
 #, c-format
230 238 
 msgid "%s: --detect-forged-local-addresses is not compatible with --outgoing\n"
231 239 
 msgstr ""
232 240
233 
-#: clamav-milter.c:1003
241 
+#: clamav-milter.c:1046
234 242 
 #, c-format
235 243 
 msgid "%s: --detect-forged-local-addresses is not compatible with --local\n"
236 244 
 msgstr ""
237 245
238 
-#: clamav-milter.c:1007
246 
+#: clamav-milter.c:1050
239 247 
 #, c-format
240 248 
 msgid "%s: --detect-forged-local-addresses is not compatible with --force\n"
241 249 
 msgstr ""
242 250
243 
-#: clamav-milter.c:1051
251 
+#: clamav-milter.c:1094
244 252 
 #, c-format
245 253 
 msgid ""
246 254 
 "%s: The iface option to --broadcast is not supported on your operating "
247 255 
 "system\n"
248 256 
 msgstr ""
249 257
250 
-#: clamav-milter.c:1060
258 
+#: clamav-milter.c:1103
251 259 
 #, c-format
252 260 
 msgid "%s: Can't get information about user %s\n"
253 261 
 msgstr ""
254 262
255 
-#: clamav-milter.c:1071
263 
+#: clamav-milter.c:1114
256 264 
 #, c-format
257 265 
 msgid "%s: AllowSupplementaryGroups: initgroups not supported.\n"
258 266 
 msgstr ""
259 267
260 
-#: clamav-milter.c:1085
268 
+#: clamav-milter.c:1128
261 269 
 #, c-format
262 270 
 msgid "%s: You cannot use black hole mode unless you are root\n"
263 271 
 msgstr ""
264 272
265 
-#: clamav-milter.c:1095
273 
+#: clamav-milter.c:1138
266 274 
 #, c-format
267 275 
 msgid "Running as user %s (UID %d, GID %d)\n"
268 276 
 msgstr ""
269 277
270 
-#: clamav-milter.c:1098
278 
+#: clamav-milter.c:1141
271 279 
 #, c-format
272 280 
 msgid "%s: running as root is not recommended (check \"User\" in %s)\n"
273 281 
 msgstr ""
274 282
275 
-#: clamav-milter.c:1101
283 
+#: clamav-milter.c:1144
276 284 
 #, c-format
277 285 
 msgid "%s: Only root can set an interface for --broadcast\n"
278 286 
 msgstr ""
279 287
280 
-#: clamav-milter.c:1106
288 
+#: clamav-milter.c:1149
281 289 
 #, c-format
282 290 
 msgid "%s: Advisory mode doesn't work with quarantine mode\n"
283 291 
 msgstr ""
284 292
285 
-#: clamav-milter.c:1114
293 
+#: clamav-milter.c:1157
286 294 
 #, c-format
287 295 
 msgid "%s: Advisory mode doesn't work with quarantine directories\n"
288 296 
 msgstr ""
289 297
290 
-#: clamav-milter.c:1120
298 
+#: clamav-milter.c:1163
291 299 
 #, c-format
292 300 
 msgid "%s: the quarantine directory must not contain the string 'ERROR'\n"
293 301 
 msgstr ""
294 302
295 
-#: clamav-milter.c:1126
303 
+#: clamav-milter.c:1169
296 304 
 #, c-format
297 305 
 msgid "%s: the quarantine directory must not contain the string 'FOUND'\n"
298 306 
 msgstr ""
299 307
300 
-#: clamav-milter.c:1132
308 
+#: clamav-milter.c:1175
301 309 
 #, c-format
302 310 
 msgid "%s: the quarantine directory must not contain the string 'OK'\n"
303 311 
 msgstr ""
304 312
305 
-#: clamav-milter.c:1149
313 
+#: clamav-milter.c:1192
306 314 
 #, c-format
307 315 
 msgid "%s: insecure quarantine directory %s (mode 0%o)\n"
308 316 
 msgstr ""
309 317
310 
-#: clamav-milter.c:1190
318 
+#: clamav-milter.c:1234
311 319 
 #, c-format
312 320 
 msgid "%s: ReadTimeout must not be negative in %s\n"
313 321 
 msgstr ""
314 322
315 
-#: clamav-milter.c:1199
323 
+#: clamav-milter.c:1243
316 324 
 #, c-format
317 325 
 msgid "%s: StreamMaxLength must not be negative in %s\n"
318 326 
 msgstr ""
319 327
320 
-#: clamav-milter.c:1231
328 
+#: clamav-milter.c:1274
321 329 
 #, c-format
322 330 
 msgid ""
323 331 
 "%s: (-q && !LogSyslog): warning - all interception message methods are off\n"
324 332 
 msgstr ""
325 333
326 
-#: clamav-milter.c:1241
334 
+#: clamav-milter.c:1284
327 335 
 #, c-format
328 336 
 msgid "%s: --max-children must be given if --external is not given\n"
329 337 
 msgstr ""
330 338
331 
-#: clamav-milter.c:1245
339 
+#: clamav-milter.c:1288
332 340 
 #, c-format
333 341 
 msgid "%s: --freshclam_monitor must be at least one second\n"
334 342 
 msgstr ""
335 343
336 
-#: clamav-milter.c:1250
344 
+#: clamav-milter.c:1293
337 345 
 #, c-format
338 346 
 msgid "%s: --timeout must not be given if --external is not given\n"
339 347 
 msgstr ""
340 348
341 
-#: clamav-milter.c:1263
349 
+#: clamav-milter.c:1306
342 350 
 #, c-format
343 351 
 msgid "%s: No emails will be scanned"
344 352 
 msgstr ""
345 353
346 
-#: clamav-milter.c:1274
354 
+#: clamav-milter.c:1317
347 355 
 #, c-format
348 356 
 msgid "%s: You can select one server type only (local/TCP) in %s\n"
349 357 
 msgstr ""
350 358
351 
-#: clamav-milter.c:1279
359 
+#: clamav-milter.c:1322
352 360 
 #, c-format
353 361 
 msgid "%s: You cannot use the --server option when using LocalSocket in %s\n"
354 362 
 msgstr ""
355 363
356 
-#: clamav-milter.c:1289
364 
+#: clamav-milter.c:1332
357 365 
 #, c-format
358 366 
 msgid "The connection from sendmail to %s (%s) must not\n"
359 367 
 msgstr ""
360 368
361 
-#: clamav-milter.c:1291
369 
+#: clamav-milter.c:1334
362 370 
 #, c-format
363 371 
 msgid "be the same as the connection to clamd (%s) in %s\n"
364 372 
 msgstr ""
365 373
366 
-#: clamav-milter.c:1301 clamav-milter.c:1328
374 
+#: clamav-milter.c:1344 clamav-milter.c:1371
367 375 
 #, c-format
368 376 
 msgid "Can't talk to clamd server via %s\n"
369 377 
 msgstr ""
370 378
371 
-#: clamav-milter.c:1303 clamav-milter.c:1330
379 
+#: clamav-milter.c:1346 clamav-milter.c:1373
372 380 
 #, c-format
373 381 
 msgid "Check your entry for LocalSocket in %s\n"
374 382 
 msgstr ""
375 383
376 
-#: clamav-milter.c:1341
384 
+#: clamav-milter.c:1384
377 385 
 msgid "Can't create a clamd session"
378 386 
 msgstr ""
379 387
380 
-#: clamav-milter.c:1358
388 
+#: clamav-milter.c:1401
381 389 
 #, c-format
382 390 
 msgid "%s: --quarantine-dir not supported for TCPSocket - use --quarantine\n"
383 391 
 msgstr ""
384 392
385 
-#: clamav-milter.c:1373
393 
+#: clamav-milter.c:1416
386 394 
 #, c-format
387 395 
 msgid "%s: hostname %s is longer than %d characters\n"
388 396 
 msgstr ""
389 397
390 
-#: clamav-milter.c:1392 clamav-milter.c:1496
398 
+#: clamav-milter.c:1435 clamav-milter.c:1552
391 399 
 #, c-format
392 400 
 msgid "%s: --max-children must be given in sessions mode\n"
393 401 
 msgstr ""
394 402
395 
-#: clamav-milter.c:1398
403 
+#: clamav-milter.c:1441
396 404 
 #, c-format
397 405 
 msgid ""
398 406 
 "%1$s: --max-children (%2$d) is lower than the number of servers you have (%3"
399 407 
 "$d)\n"
400 408 
 msgstr ""
401 409
402 
-#: clamav-milter.c:1425
410 
+#: clamav-milter.c:1468
403 411 
 #, c-format
404 412 
 msgid "%s: Unknown host %s\n"
405 413 
 msgstr ""
406 414
407 
-#: clamav-milter.c:1437
415 
+#: clamav-milter.c:1493
408 416 
 #, c-format
409 417 
 msgid "Can't talk to clamd server %s on port %d\n"
410 418 
 msgstr ""
411 419
412 
-#: clamav-milter.c:1441
420 
+#: clamav-milter.c:1497
413 421 
 #, c-format
414 422 
 msgid "Check the value for TCPAddr in %s\n"
415 423 
 msgstr ""
416 424
417 
-#: clamav-milter.c:1443
425 
+#: clamav-milter.c:1499
418 426 
 #, c-format
419 427 
 msgid "Check the value for TCPAddr in clamd.conf on %s\n"
420 428 
 msgstr ""
421 429
422 
-#: clamav-milter.c:1459
430 
+#: clamav-milter.c:1515
423 431 
 msgid "Can't find any active clamd servers\n"
424 432 
 msgstr ""
425 433
426 
-#: clamav-milter.c:1460 clamav-milter.c:1466
434 
+#: clamav-milter.c:1516 clamav-milter.c:1522
427 435 
 #, c-format
428 436 
 msgid "Check your entry for TCPSocket in %s\n"
429 437 
 msgstr ""
430 438
431 
-#: clamav-milter.c:1465
439 
+#: clamav-milter.c:1521
432 440 
 msgid "Can't find any clamd servers\n"
433 441 
 msgstr ""
434 442
435 
-#: clamav-milter.c:1469
443 
+#: clamav-milter.c:1525
436 444 
 msgid "Can't find any clamd server"
437 445 
 msgstr ""
438 446
439 
-#: clamav-milter.c:1476
447 
+#: clamav-milter.c:1532
440 448 
 #, c-format
441 449 
 msgid "%s: You must select server type (local/TCP) in %s\n"
442 450 
 msgstr ""
443 451
444 
-#: clamav-milter.c:1572
452 
+#: clamav-milter.c:1628
445 453 
 #, c-format
446 454 
 msgid "When debugging it is recommended that you use Foreground mode in %s\n"
447 455 
 msgstr ""
448 456
449 
-#: clamav-milter.c:1573
457 
+#: clamav-milter.c:1629
450 458 
 msgid "\tso that you can see all of the messages"
451 459 
 msgstr ""
452 460
453 
-#: clamav-milter.c:1662
461 
+#: clamav-milter.c:1718
454 462 
 #, c-format
455 463 
 msgid "%s: ScanMail not defined in %s (needed without --external), enabling\n"
456 464 
 msgstr ""
457 465
458 
-#: clamav-milter.c:1719
466 
+#: clamav-milter.c:1778
459 467 
 msgid "Starting clamav-milter"
460 468 
 msgstr ""
461 469
462 
-#: clamav-milter.c:1729
470 
+#: clamav-milter.c:1788
463 471 
 #, c-format
464 472 
 msgid "pidfile: '%s' must be a full pathname"
465 473 
 msgstr ""
466 474
467 
-#: clamav-milter.c:1731
475 
+#: clamav-milter.c:1790
468 476 
 #, c-format
469 477 
 msgid "pidfile '%s' must be a full pathname\n"
470 478 
 msgstr ""
471 479
472 
-#: clamav-milter.c:1745
480 
+#: clamav-milter.c:1804
473 481 
 #, c-format
474 482 
 msgid "Can't save PID in file %s"
475 483 
 msgstr ""
476 484
477 
-#: clamav-milter.c:1747
485 
+#: clamav-milter.c:1806
478 486 
 #, c-format
479 487 
 msgid "Can't save PID in file %s\n"
480 488 
 msgstr ""
481 489
482 
-#: clamav-milter.c:1809
490 
+#: clamav-milter.c:1868
483 491 
 #, c-format
484 492 
 msgid "Starting %s"
485 493 
 msgstr ""
486 494
487 
-#: clamav-milter.c:1812
495 
+#: clamav-milter.c:1871
488 496 
 msgid "Debugging is on"
489 497 
 msgstr ""
490 498
491 
-#: clamav-milter.c:1889
499 
+#: clamav-milter.c:1886 clamav-milter.c:5788 clamav-milter.c:5854
500 
+#, c-format
501 
+msgid "^Won't blacklist %s\n"
502 
+msgstr ""
503 
+
504 
+#: clamav-milter.c:1959
492 505 
 #, c-format
493 506 
 msgid "Check clamd server %s - it may be down\n"
494 507 
 msgstr ""
495 508
496 
-#: clamav-milter.c:1894
509 
+#: clamav-milter.c:1964
497 510 
 msgid "Check clamd server - it may be down"
498 511 
 msgstr ""
499 512
500 
-#: clamav-milter.c:2099
513 
+#: clamav-milter.c:2169
501 514 
 msgid "No free clamd sessions\n"
502 515 
 msgstr ""
503 516
504 
-#: clamav-milter.c:2177
505 
-#, c-format
506 
-msgid "^Check clamd server %s - it may be down\n"
517 
+#: clamav-milter.c:2284
518 
+msgid "^Couldn't establish a connection to any clamd server\n"
507 519 
 msgstr ""
508 520
509 
-#: clamav-milter.c:2182
510 
-msgid "Check clamd server - it may be down\n"
521 
+#: clamav-milter.c:2308
522 
+#, c-format
523 
+msgid "^findServer: select failed (maxsock = %d)\n"
511 524 
 msgstr ""
512 525
513 
-#: clamav-milter.c:2221
514 
-msgid "findServer: select failed"
526 
+#: clamav-milter.c:2322
527 
+msgid "^findServer: No response from any server\n"
515 528 
 msgstr ""
516 529
517 
-#: clamav-milter.c:2235
518 
-msgid "findServer: No response from any server\n"
530 
+#: clamav-milter.c:2359
531 
+#, c-format
532 
+msgid "^Check clamd server %s - it may be down\n"
519 533 
 msgstr ""
520 534
521 
-#: clamav-milter.c:2237
522 
-msgid "findServer: No response from any server"
535 
+#: clamav-milter.c:2363
536 
+msgid "Check clamd server - it may be down\n"
523 537 
 msgstr ""
524 538
525 
-#: clamav-milter.c:2260
539 
+#: clamav-milter.c:2388
526 540 
 msgid "clamfi_connect: ctx is null"
527 541 
 msgstr ""
528 542
529 
-#: clamav-milter.c:2265
543 
+#: clamav-milter.c:2393
530 544 
 msgid "clamfi_connect: hostname is null"
531 545 
 msgstr ""
532 546
533 
-#: clamav-milter.c:2286
547 
+#: clamav-milter.c:2420
534 548 
 msgid "clamfi_connect: remoteIP is null"
535 549 
 msgstr ""
536 550
537 
-#: clamav-milter.c:2295
551 
+#: clamav-milter.c:2429
538 552 
 #, c-format
539 553 
 msgid "clamfi_connect: connection from %s"
540 554 
 msgstr ""
541 555
542 
-#: clamav-milter.c:2296
556 
+#: clamav-milter.c:2430
543 557 
 #, c-format
544 558 
 msgid "clamfi_connect: connection from %s\n"
545 559 
 msgstr ""
546 560
547 
-#: clamav-milter.c:2299
561 
+#: clamav-milter.c:2433
548 562 
 #, c-format
549 563 
 msgid "clamfi_connect: connection from %s [%s]"
550 564 
 msgstr ""
551 565
552 
-#: clamav-milter.c:2300
566 
+#: clamav-milter.c:2434
553 567 
 #, c-format
554 568 
 msgid "clamfi_connect: connection from %s [%s]\n"
555 569 
 msgstr ""
556 570
557 
-#: clamav-milter.c:2320
571 
+#: clamav-milter.c:2454
558 572 
 msgid "Can't get sendmail hostname"
559 573 
 msgstr ""
560 574
561 
-#: clamav-milter.c:2329
575 
+#: clamav-milter.c:2463
562 576 
 #, c-format
563 577 
 msgid "Access Denied: Host Unknown (%s)"
564 578 
 msgstr ""
565 579
566 
-#: clamav-milter.c:2338
580 
+#: clamav-milter.c:2472
567 581 
 #, c-format
568 582 
 msgid "Can't find entry for IP address %s in DNS - check your DNS setting\n"
569 583 
 msgstr ""
570 584
571 
-#: clamav-milter.c:2349
585 
+#: clamav-milter.c:2483
572 586 
 #, c-format
573 587 
 msgid "Access Denied: Can't get IP address for (%s)"
574 588 
 msgstr ""
575 589
576 
-#: clamav-milter.c:2366
590 
+#: clamav-milter.c:2500
577 591 
 #, c-format
578 592 
 msgid "Access Denied for %s[%s]"
579 593 
 msgstr ""
580 594
581 
-#: clamav-milter.c:2384
595 
+#: clamav-milter.c:2518
582 596 
 msgid "clamfi_connect: not scanning outgoing messages"
583 597 
 msgstr ""
584 598
585 
-#: clamav-milter.c:2385
599 
+#: clamav-milter.c:2519
586 600 
 msgid "clamfi_connect: not scanning outgoing messages\n"
587 601 
 msgstr ""
588 602
589 
-#: clamav-milter.c:2393
590 
-msgid "clamfi_connect: not scanning local messages"
603 
+#: clamav-milter.c:2526
604 
+msgid "*clamfi_connect: not scanning local messages\n"
591 605 
 msgstr ""
592 606
593 
-#: clamav-milter.c:2394
594 
-msgid "clamfi_connect: not scanning local messages\n"
595 
-msgstr ""
596 
-
597 
-#: clamav-milter.c:2408
598 
-msgid "clamfi_connect: gethostname failed"
607 
+#: clamav-milter.c:2539
608 
+msgid "^clamfi_connect: gethostname failed"
599 609 
 msgstr ""
600 610
601 
-#: clamav-milter.c:2413
602 
-msgid "Rejected email falsely claiming to be from here"
611 
+#: clamav-milter.c:2544
612 
+msgid "Rejected connexion falsely claiming to be from here\n"
603 613 
 msgstr ""
604 614
605 
-#: clamav-milter.c:2414
615 
+#: clamav-milter.c:2545
606 616 
 msgid "You have claimed to be me, but you are not"
607 617 
 msgstr ""
608 618
609 
-#: clamav-milter.c:2415 clamav-milter.c:2765
619 
+#: clamav-milter.c:2546 clamav-milter.c:2863
610 620 
 msgid "Forged local address detected"
611 621 
 msgstr ""
612 622
613 
-#: clamav-milter.c:2427
614 
-msgid "Your IP is blacklisted"
623 
+#: clamav-milter.c:2562
624 
+#, c-format
625 
+msgid "%s is blacklisted because your machine is infected with a virus"
615 626 
 msgstr ""
616 627
617 
-#: clamav-milter.c:2428
628 
+#: clamav-milter.c:2564 clamav-milter.c:2673
618 629 
 msgid "Blacklisted IP detected"
619 630 
 msgstr ""
620 631
621 
-#: clamav-milter.c:2492
632 
+#: clamav-milter.c:2620
633 
+msgid "*clamfi_envfrom: ignoring whitelisted message"
634 
+msgstr ""
635 
+
636 
+#: clamav-milter.c:2634
622 637 
 msgid "Rejected email with empty from field"
623 638 
 msgstr ""
624 639
625 
-#: clamav-milter.c:2493
640 
+#: clamav-milter.c:2635
626 641 
 msgid "You have not said who the email is from"
627 642 
 msgstr ""
628 643
629 
-#: clamav-milter.c:2494
644 
+#: clamav-milter.c:2636
630 645 
 msgid "Reject email with empty from field"
631 646 
 msgstr ""
632 647
633 
-#: clamav-milter.c:2531
634 
-#, c-format
635 
-msgid "hit max-children limit (%u >= %u)\n"
636 
-msgstr ""
637 
-
638 
-#: clamav-milter.c:2532
639 
-#, c-format
640 
-msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
641 
-msgstr ""
642 
-
643 
-#: clamav-milter.c:2538
644 
-#, c-format
645 
-msgid "hit max-children limit (%u >= %u)"
646 
-msgstr ""
647 
-
648 
-#: clamav-milter.c:2539
649 
-#, c-format
650 
-msgid "hit max-children limit (%u >= %u): waiting for some to exit"
651 
-msgstr ""
652 
-
653 
-#: clamav-milter.c:2544
648 
+#: clamav-milter.c:2654
654 649 
 msgid "AV system temporarily overloaded - please try later"
655 650 
 msgstr ""
656 651
657 
-#: clamav-milter.c:2565
658 
-#, c-format
659 
-msgid "n_children %u: waiting %d seconds for some to exit"
660 
-msgstr ""
661 
-
662 
-#: clamav-milter.c:2581
663 
-#, c-format
664 
-msgid "Finished waiting, n_children = %u"
665 
-msgstr ""
666 
-
667 
-#: clamav-milter.c:2592
668 
-msgid "Timeout waiting for a child to die"
669 
-msgstr ""
670 
-
671 
-#: clamav-milter.c:2594
672 
-msgid "Timeout waiting for a child to die\n"
652 
+#: clamav-milter.c:2672
653 
+msgid "Your IP is blacklisted because your machine is infected with a virus"
673 654 
 msgstr ""
674 655
675 
-#: clamav-milter.c:2730
656 
+#: clamav-milter.c:2826
676 657 
 msgid "clamfi_eoh"
677 658 
 msgstr ""
678 659
679 
-#: clamav-milter.c:2733
660 
+#: clamav-milter.c:2829
680 661 
 msgid "clamfi_eoh\n"
681 662 
 msgstr ""
682 663
683 
-#: clamav-milter.c:2757
664 
+#: clamav-milter.c:2855
684 665 
 msgid "clamfi_eoh: gethostname failed"
685 666 
 msgstr ""
686 667
687 
-#: clamav-milter.c:2763
668 
+#: clamav-milter.c:2861
688 669 
 #, c-format
689 670 
 msgid "Rejected email falsely claiming to be from %s"
690 671 
 msgstr ""
691 672
692 
-#: clamav-milter.c:2764
673 
+#: clamav-milter.c:2862
693 674 
 msgid "You have claimed to be from me, but you are not"
694 675 
 msgstr ""
695 676
696 
-#: clamav-milter.c:2811
697 
-msgid "clamfi_eoh: ignoring whitelisted message"
698 
-msgstr ""
699 
-
700 
-#: clamav-milter.c:2813
701 
-msgid "clamfi_eoh: ignoring whitelisted message\n"
677 
+#: clamav-milter.c:2909
678 
+msgid "*clamfi_enveoh: ignoring whitelisted message"
702 679 
 msgstr ""
703 680
704 
-#: clamav-milter.c:2827
681 
+#: clamav-milter.c:2922
705 682 
 #, c-format
706 683 
 msgid "clamfi_envbody: %u bytes"
707 684 
 msgstr ""
708 685
709 
-#: clamav-milter.c:2829
686 
+#: clamav-milter.c:2924
710 687 
 #, c-format
711 688 
 msgid "clamfi_envbody: %u bytes\n"
712 689 
 msgstr ""
713 690
714 
-#: clamav-milter.c:2886 clamav-milter.c:3192
691 
+#: clamav-milter.c:2981 clamav-milter.c:3287
715 692 
 #, c-format
716 693 
 msgid "%s: Message more than StreamMaxLength (%ld) bytes - not scanned"
717 694 
 msgstr ""
718 695
719 
-#: clamav-milter.c:2890 clamav-milter.c:3195
696 
+#: clamav-milter.c:2985 clamav-milter.c:3290
720 697 
 msgid "Not Scanned - StreamMaxLength exceeded"
721 698 
 msgstr ""
722 699
723 
-#: clamav-milter.c:2943
700 
+#: clamav-milter.c:3038
724 701 
 #, c-format
725 702 
 msgid "Failed to delete X-Virus-Status header %d"
726 703 
 msgstr ""
727 704
728 
-#: clamav-milter.c:3014
705 
+#: clamav-milter.c:3108
729 706 
 #, c-format
730 707 
 msgid "failed to send SCAN %s command to clamd"
731 708 
 msgstr ""
732 709
733 
-#: clamav-milter.c:3036
710 
+#: clamav-milter.c:3130
734 711 
 msgid "failed to send SCAN command to clamd"
735 712 
 msgstr ""
736 713
737 
-#: clamav-milter.c:3053
714 
+#: clamav-milter.c:3147
738 715 
 #, c-format
739 716 
 msgid "Waiting to read status from fd %d\n"
740 717 
 msgstr ""
741 718
742 
-#: clamav-milter.c:3066
719 
+#: clamav-milter.c:3160
743 720 
 #, c-format
744 721 
 msgid "clamfi_eom: read %s"
745 722 
 msgstr ""
746 723
747 
-#: clamav-milter.c:3067
724 
+#: clamav-milter.c:3161
748 725 
 #, c-format
749 726 
 msgid "clamfi_eom: read %s\n"
750 727 
 msgstr ""
751 728
752 
-#: clamav-milter.c:3084
729 
+#: clamav-milter.c:3178
753 730 
 #, c-format
754 731 
 msgid "clamfi_eom: read nothing from clamd on %s"
755 732 
 msgstr ""
756 733
757 
-#: clamav-milter.c:3086
734 
+#: clamav-milter.c:3180
758 735 
 #, c-format
759 736 
 msgid "clamfi_eom: read nothing from clamd on %s\n"
760 737 
 msgstr ""
761 738
762 
-#: clamav-milter.c:3131 clamav-milter.c:3177
739 
+#: clamav-milter.c:3225 clamav-milter.c:3272
763 740 
 msgid "Error determining host"
764 741 
 msgstr ""
765 742
766 
-#: clamav-milter.c:3200
743 
+#: clamav-milter.c:3295
767 744 
 msgid "Not Scanned"
768 745 
 msgstr ""
769 746
770 
-#: clamav-milter.c:3229
747 
+#: clamav-milter.c:3324
771 748 
 msgid "Infected with"
772 749 
 msgstr ""
773 750
774 
-#: clamav-milter.c:3253
751 
+#: clamav-milter.c:3348
775 752 
 #, c-format
776 753 
 msgid "Intercepted virus from %s to"
777 754 
 msgstr ""
778 755
779 
-#: clamav-milter.c:3347
756 
+#: clamav-milter.c:3444
780 757 
 msgid "Subject: Virus intercepted\n"
781 758 
 msgstr ""
782 759
783 
-#: clamav-milter.c:3363
760 
+#: clamav-milter.c:3460
784 761 
 #, c-format
785 762 
 msgid "Can't open e-mail template header file %s"
786 763 
 msgstr ""
787 764
788 
-#: clamav-milter.c:3378 clamav-milter.c:3382
765 
+#: clamav-milter.c:3475 clamav-milter.c:3479
789 766 
 msgid "\n"
790 767 
 msgstr ""
791 768
792 
-#: clamav-milter.c:3390
769 
+#: clamav-milter.c:3488
793 770 
 msgid "A message you sent to\n"
794 771 
 msgstr ""
795 772
796 
-#: clamav-milter.c:3397
773 
+#: clamav-milter.c:3498
797 774 
 #, c-format
798 775 
 msgid "The message %1$s sent from %2$s to\n"
799 776 
 msgstr ""
800 777
801 
-#: clamav-milter.c:3400
778 
+#: clamav-milter.c:3501
802 779 
 #, c-format
803 780 
 msgid "A message sent from %s to\n"
804 781 
 msgstr ""
805 782
806 
-#: clamav-milter.c:3405
783 
+#: clamav-milter.c:3506
807 784 
 #, c-format
808 785 
 msgid "contained %s and has not been accepted for delivery.\n"
809 786 
 msgstr ""
810 787
811 
-#: clamav-milter.c:3408
788 
+#: clamav-milter.c:3509
812 789 
 #, c-format
813 790 
 msgid ""
814 791 
 "\n"
815 792 
 "The message in question has been quarantined as %s\n"
816 793 
 msgstr ""
817 794
818 
-#: clamav-milter.c:3411
795 
+#: clamav-milter.c:3512
819 796 
 #, c-format
820 797 
 msgid ""
821 798 
 "\n"
... ... 
@@ -823,13 +800,13 @@ msgid ""
823 823 
 "\n"
824 824 
 msgstr ""
825 825
826 
-#: clamav-milter.c:3414
826 
+#: clamav-milter.c:3515
827 827 
 msgid ""
828 828 
 "For your information, the original message headers were:\n"
829 829 
 "\n"
830 830 
 msgstr ""
831 831
832 
-#: clamav-milter.c:3427
832 
+#: clamav-milter.c:3528
833 833 
 #, c-format
834 834 
 msgid ""
835 835 
 "\n"
... ... 
@@ -837,265 +814,304 @@ msgid ""
837 837 
 "%s\t\n"
838 838 
 msgstr ""
839 839
840 
-#: clamav-milter.c:3435
840 
+#: clamav-milter.c:3536
841 841 
 #, c-format
842 842 
 msgid "%s: Failed to notify clamAV interception - see dead.letter"
843 843 
 msgstr ""
844 844
845 
-#: clamav-milter.c:3437
845 
+#: clamav-milter.c:3538
846 846 
 #, c-format
847 847 
 msgid "Can't execute '%s' to send virus notice"
848 848 
 msgstr ""
849 849
850 
-#: clamav-milter.c:3465
850 
+#: clamav-milter.c:3557
851 851 
 #, c-format
852 852 
 msgid "#Reported phishing to %s"
853 853 
 msgstr ""
854 854
855 
-#: clamav-milter.c:3467
855 
+#: clamav-milter.c:3559
856 
+#, c-format
857 
+msgid "^Couldn't report to %s\n"
858 
+msgstr ""
859 
+
860 
+#: clamav-milter.c:3561
856 861 
 msgid "^Can't set anti-phish header\n"
857 862 
 msgstr ""
858 863
859 
-#: clamav-milter.c:3485
864 
+#: clamav-milter.c:3583
860 865 
 #, c-format
861 866 
 msgid "^Can't set quarantine user %s"
862 867 
 msgstr ""
863 868
864 
-#: clamav-milter.c:3509
869 
+#: clamav-milter.c:3617
865 870 
 #, c-format
866 871 
 msgid "virus %s detected by ClamAV - http://www.clamav.net"
867 872 
 msgstr ""
868 873
869 
-#: clamav-milter.c:3521
874 
+#: clamav-milter.c:3622
875 
+#, c-format
876 
+msgid "Will blacklist %s for %d seconds because of %s\n"
877 
+msgstr ""
878 
+
879 
+#: clamav-milter.c:3631
870 880 
 msgid "Unknown"
871 881 
 msgstr ""
872 882
873 
-#: clamav-milter.c:3523
883 
+#: clamav-milter.c:3633
874 884 
 #, c-format
875 885 
 msgid "%s: incorrect message \"%s\" from clamd"
876 886 
 msgstr ""
877 887
878 
-#: clamav-milter.c:3529
888 
+#: clamav-milter.c:3639
879 889 
 msgid "Clean"
880 890 
 msgstr ""
881 891
882 
-#: clamav-milter.c:3533
892 
+#: clamav-milter.c:3643
883 893 
 #, c-format
884 894 
 msgid "%s: clean message from %s"
885 895 
 msgstr ""
886 896
887 
-#: clamav-milter.c:3535
897 
+#: clamav-milter.c:3645
888 898 
 msgid "an unknown sender"
889 899 
 msgstr ""
890 900
891 
-#: clamav-milter.c:3631
901 
+#: clamav-milter.c:3740
892 902 
 #, c-format
893 903 
 msgid "Can't remove clean file %s"
894 904 
 msgstr ""
895 905
896 
-#: clamav-milter.c:3824 clamav-milter.c:3827
906 
+#: clamav-milter.c:3914 clamav-milter.c:3917
897 907 
 #, c-format
898 908 
 msgid "write failure (%u bytes) to %s: %s"
899 909 
 msgstr ""
900 910
901 
-#: clamav-milter.c:3841 clamav-milter.c:3844
911 
+#: clamav-milter.c:3930 clamav-milter.c:3933
902 912 
 #, c-format
903 
-msgid "write failure (%u bytes) to clamd: %s"
913 
+msgid "!write failure (%u bytes) to clamd: %s\n"
904 914 
 msgstr ""
905 915
906 
-#: clamav-milter.c:3922
916 
+#: clamav-milter.c:4012
907 917 
 #, c-format
908 918 
 msgid "No data received from clamd in %d seconds\n"
909 919 
 msgstr ""
910 920
911 
-#: clamav-milter.c:3951
921 
+#: clamav-milter.c:4041
912 922 
 #, c-format
913 923 
 msgid "Can't stat %s"
914 924 
 msgstr ""
915 925
916 
-#: clamav-milter.c:3962 clamav-milter.c:4409
926 
+#: clamav-milter.c:4052 clamav-milter.c:4499
917 927 
 #, c-format
918 928 
 msgid "Can't open %s"
919 929 
 msgstr ""
920 930
921 
-#: clamav-milter.c:4087 clamav-milter.c:4589
931 
+#: clamav-milter.c:4177
922 932 
 #, c-format
923 933 
 msgid "mkdir %s failed"
924 934 
 msgstr ""
925 935
926 
-#: clamav-milter.c:4102
936 
+#: clamav-milter.c:4192
927 937 
 #, c-format
928 938 
 msgid "mktemp %s failed"
929 939 
 msgstr ""
930 940
931 
-#: clamav-milter.c:4112
941 
+#: clamav-milter.c:4202
932 942 
 #, c-format
933 943 
 msgid "Temporary quarantine file %s creation failed"
934 944 
 msgstr ""
935 945
936 
-#: clamav-milter.c:4217
946 
+#: clamav-milter.c:4307
937 947 
 #, c-format
938 948 
 msgid "failed to send STREAM command clamd server %d"
939 949 
 msgstr ""
940 950
941 
-#: clamav-milter.c:4226
951 
+#: clamav-milter.c:4316
942 952 
 msgid "failed to send STREAM command clamd"
943 953 
 msgstr ""
944 954
945 
-#: clamav-milter.c:4238
955 
+#: clamav-milter.c:4328
946 956 
 msgid "failed to create TCPSocket to talk to clamd"
947 957 
 msgstr ""
948 958
949 
-#: clamav-milter.c:4250 clamav-milter.c:4266
959 
+#: clamav-milter.c:4340 clamav-milter.c:4356
950 960 
 msgid "recv failed from clamd getting PORT"
951 961 
 msgstr ""
952 962
953 
-#: clamav-milter.c:4254 clamav-milter.c:4268
963 
+#: clamav-milter.c:4344 clamav-milter.c:4358
954 964 
 msgid "EOF from clamd getting PORT"
955 965 
 msgstr ""
956 966
957 
-#: clamav-milter.c:4279
967 
+#: clamav-milter.c:4369
958 968 
 #, c-format
959 969 
 msgid "Expected port information from clamd, got '%s'"
960 970 
 msgstr ""
961 971
962 
-#: clamav-milter.c:4282
972 
+#: clamav-milter.c:4372
963 973 
 #, c-format
964 974 
 msgid "Expected port information from clamd, got '%s'\n"
965 975 
 msgstr ""
966 976
967 
-#: clamav-milter.c:4302 clamav-milter.c:4305
977 
+#: clamav-milter.c:4392 clamav-milter.c:4395
968 978 
 #, c-format
969 979 
 msgid "Connecting to local port %d - data %d cmd %d\n"
970 980 
 msgstr ""
971 981
972 
-#: clamav-milter.c:4320 clamav-milter.c:4323
982 
+#: clamav-milter.c:4410 clamav-milter.c:4413
973 983 
 #, c-format
974 984 
 msgid "Failed to connect to port %d given by clamd: %s"
975 985 
 msgstr ""
976 986
977 
-#: clamav-milter.c:4421
987 
+#: clamav-milter.c:4511
978 988 
 #, c-format
979 989 
 msgid "Clamd (pid %d) seems to have died"
980 990 
 msgstr ""
981 991
982 
-#: clamav-milter.c:4447
992 
+#: clamav-milter.c:4537
983 993 
 #, c-format
984 994 
 msgid "Can't open e-mail template file %s"
985 995 
 msgstr ""
986 996
987 
-#: clamav-milter.c:4456
997 
+#: clamav-milter.c:4546
988 998 
 #, c-format
989 999 
 msgid "Can't stat e-mail template file %s"
990 1000 
 msgstr ""
991 1001
992 
-#: clamav-milter.c:4465
1002 
+#: clamav-milter.c:4555
993 1003 
 msgid "Out of memory"
994 1004 
 msgstr ""
995 1005
996 
-#: clamav-milter.c:4471
1006 
+#: clamav-milter.c:4561
997 1007 
 #, c-format
998 1008 
 msgid "Error reading e-mail template file %s"
999 1009 
 msgstr ""
1000 1010
1001 
-#: clamav-milter.c:4500
1011 
+#: clamav-milter.c:4590
1002 1012 
 #, c-format
1003 1013 
 msgid "%s: Unknown clamAV variable \"%c\"\n"
1004 1014 
 msgstr ""
1005 1015
1006 
-#: clamav-milter.c:4511
1016 
+#: clamav-milter.c:4601
1007 1017 
 #, c-format
1008 1018 
 msgid "%s: Unterminated sendmail variable \"%s\"\n"
1009 1019 
 msgstr ""
1010 1020
1011 
-#: clamav-milter.c:4522
1021 
+#: clamav-milter.c:4612
1012 1022 
 #, c-format
1013 1023 
 msgid "%s: Unknown sendmail variable \"%s\"\n"
1014 1024 
 msgstr ""
1015 1025
1016 
-#: clamav-milter.c:4615
1026 
+#: clamav-milter.c:4678
1017 1027 
 #, c-format
1018 
-msgid "Can't rename %1$s to %2$s"
1028 
+msgid "!mkdir %s failed\n"
1019 1029 
 msgstr ""
1020 1030
1021 
-#: clamav-milter.c:4624
1031 
+#: clamav-milter.c:4703
1022 1032 
 #, c-format
1023 
-msgid "Email quarantined as %s"
1033 
+msgid "^Can't rename %1$s to %2$s\n"
1024 1034 
 msgstr ""
1025 1035
1026 
-#: clamav-milter.c:4728
1036 
+#: clamav-milter.c:4711
1037 
+#, c-format
1038 
+msgid "Email quarantined as %s\n"
1039 
+msgstr ""
1040 
+
1041 
+#: clamav-milter.c:4819
1027 1042 
 #, c-format
1028 1043 
 msgid "[Virus] %s"
1029 1044 
 msgstr ""
1030 1045
1031 
-#: clamav-milter.c:4825
1046 
+#: clamav-milter.c:4916
1032 1047 
 msgid ""
1033 1048 
 "!No response from any clamd server - your AV system is not scanning emails\n"
1034 1049 
 msgstr ""
1035 1050
1036 
-#: clamav-milter.c:4843
1051 
+#: clamav-milter.c:4934
1037 1052 
 msgid "Subject: ClamAV Down\n"
1038 1053 
 msgstr ""
1039 1054
1040 
-#: clamav-milter.c:4846
1055 
+#: clamav-milter.c:4937
1041 1056 
 msgid ""
1042 1057 
 "This is an automatic message\n"
1043 1058 
 "\n"
1044 1059 
 msgstr ""
1045 1060
1046 
-#: clamav-milter.c:4849
1061 
+#: clamav-milter.c:4940
1047 1062 
 msgid "The clamd program cannot be contacted.\n"
1048 1063 
 msgstr ""
1049 1064
1050 
-#: clamav-milter.c:4851
1065 
+#: clamav-milter.c:4942
1051 1066 
 msgid "No clamd server can be contacted.\n"
1052 1067 
 msgstr ""
1053 1068
1054 
-#: clamav-milter.c:4853
1069 
+#: clamav-milter.c:4944
1055 1070 
 msgid "Emails may not be being scanned, please check your servers.\n"
1056 1071 
 msgstr ""
1057 1072
1058 
-#: clamav-milter.c:4914 clamav-milter.c:5061
1073 
+#: clamav-milter.c:5005 clamav-milter.c:5152
1059 1074 
 msgid "!No emails will be scanned"
1060 1075 
 msgstr ""
1061 1076
1062 
-#: clamav-milter.c:5127
1077 
+#: clamav-milter.c:5218
1063 1078 
 #, c-format
1064 1079 
 msgid "Stopping %s"
1065 1080 
 msgstr ""
1066 1081
1067 
-#: clamav-milter.c:5175
1082 
+#: clamav-milter.c:5266
1068 1083 
 msgid "Stopping clamav-milter"
1069 1084 
 msgstr ""
1070 1085
1071 
-#: clamav-milter.c:5309
1086 
+#: clamav-milter.c:5416
1072 1087 
 #, c-format
1073 1088 
 msgid "Loaded %s"
1074 1089 
 msgstr ""
1075 1090
1076 
-#: clamav-milter.c:5313
1091 
+#: clamav-milter.c:5420
1077 1092 
 #, c-format
1078 1093 
 msgid "ClamAV: Protecting against %u viruses"
1079 1094 
 msgstr ""
1080 1095
1081 
-#: clamav-milter.c:5465
1096 
+#: clamav-milter.c:5575
1082 1097 
 #, c-format
1083 1098 
 msgid "Can't open whitelist file %s"
1084 1099 
 msgstr ""
1085 1100
1086 
-#: clamav-milter.c:5473
1101 
+#: clamav-milter.c:5584
1087 1102 
 msgid "Can't create whitelist table"
1088 1103 
 msgstr ""
1089 1104
1090 
-#: clamav-milter.c:5532
1105 
+#: clamav-milter.c:5673
1091 1106 
 msgid "Can't create blacklist table"
1092 1107 
 msgstr ""
1093 1108
1094 
-#: clamav-milter.c:5724
1109 
+#: clamav-milter.c:5863
1095 1110 
 msgid "^MX peers will not be immune from being blacklisted"
1096 1111 
 msgstr ""
1097 1112
1098 
-#: clamav-milter.c:5770
1113 
+#: clamav-milter.c:5909
1099 1114 
 #, c-format
1100 1115 
 msgid "Can't execute '%s' to expand '%s'"
1101 1116 
 msgstr ""
1117 
+
1118 
+#: clamav-milter.c:5969
1119 
+#, c-format
1120 
+msgid "hit max-children limit (%u >= %u)\n"
1121 
+msgstr ""
1122 
+
1123 
+#: clamav-milter.c:5970
1124 
+#, c-format
1125 
+msgid "hit max-children limit (%u >= %u): waiting for some to exit\n"
1126 
+msgstr ""
1127 
+
1128 
+#: clamav-milter.c:5992
1129 
+#, c-format
1130 
+msgid "n_children %d: waiting %d seconds for some to exit\n"
1131 
+msgstr ""
1132 
+
1133 
+#: clamav-milter.c:6005
1134 
+#, c-format
1135 
+msgid "Finished waiting, n_children = %d\n"
1136 
+msgstr ""
1137 
+
1138 
+#: clamav-milter.c:6013
1139 
+msgid "*Timeout waiting for a child to die\n"
1140 
+msgstr ""
clamav-devel/libclamav/blob.c
History View file @ 27395a6
... ... 
@@ -16,7 +16,7 @@
16 16 
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17 17 
  *  MA 02110-1301, USA.
18 18 
  */
19 
-static	char	const	rcsid[] = "$Id: blob.c,v 1.63 2007/02/12 20:46:08 njh Exp $";
19 
+static	char	const	rcsid[] = "$Id: blob.c,v 1.64 2007/02/12 22:25:14 njh Exp $";
20 20
21 21 
 #if HAVE_CONFIG_H
22 22 
 #include "clamav-config.h"
... ... 
@@ -388,7 +388,7 @@ fileblobDestroy(fileblob *fb)
388 388 
 	} else if(fb->b.data) {
389 389 
 		free(fb->b.data);
390 390 
 		if(fb->b.name) {
391 
-			cli_errmsg("fileblobDestroy: %s not saved: refer to http://www.clamav.net/bugs.html#pagestart\n", fb->b.name);
391 
+			cli_errmsg("fileblobDestroy: %s not saved: report to http://bugs.clamav.net\n", fb->b.name);
392 392 
 			free(fb->b.name);
393 393 
 		} else
394 394 
 			cli_errmsg("fileblobDestroy: file not saved (%lu bytes): report to http://bugs.clamav.net\n",
clamav-devel/libclamav/mbox.c
History View file @ 27395a6
... ... 
@@ -16,7 +16,7 @@
16 16 
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17 17 
  *  MA 02110-1301, USA.
18 18 
  */
19 
-static	char	const	rcsid[] = "$Id: mbox.c,v 1.374 2007/02/12 20:46:08 njh Exp $";
19 
+static	char	const	rcsid[] = "$Id: mbox.c,v 1.375 2007/02/12 22:22:27 njh Exp $";
20 20
21 21 
 #ifdef	_MSC_VER
22 22 
 #include <winsock.h>	/* only needed in CL_EXPERIMENTAL */
... ... 
@@ -4980,7 +4980,7 @@ getline_from_mbox(char *buffer, size_t len, FILE *fin)
4980 4980 
 		return NULL;
4981 4981
4982 4982 
 	if((len == 0) || (buffer == NULL)) {
4983 
-		cli_errmsg("Invalid call to getline_from_mbox(). Refer to http://www.clamav.net/bugs.html#pagestart\n");
4983 
+		cli_errmsg("Invalid call to getline_from_mbox(). Refer to http://www.clamav.net/bugs\n");
4984 4984 
 		return NULL;
4985 4985 
 	}
4986 4986
clamav-devel/libclamav/tnef.c
History View file @ 27395a6
... ... 
@@ -25,7 +25,7 @@
25 25 
 #include "clamav-config.h"
26 26 
 #endif
27 27
28 
-static	char	const	rcsid[] = "$Id: tnef.c,v 1.40 2007/02/10 22:18:27 njh Exp $";
28 
+static	char	const	rcsid[] = "$Id: tnef.c,v 1.41 2007/02/12 22:22:27 njh Exp $";
29 29
30 30 
 #include <stdio.h>
31 31 
 #include <fcntl.h>
... ... 
@@ -180,7 +180,7 @@ cli_tnef(const char *dir, int desc)
180 180 
 					if(fout >= 0) {
181 181 
 						int count;
182 182
183 
-						cli_warnmsg("Saving dump to %s:  refer to http://www.clamav.net/bugs.html#pagestart\n", filename);
183 
+						cli_warnmsg("Saving dump to %s:  refer to http://www.clamav.net/bugs\n", filename);
184 184
185 185 
 						lseek(desc, 0L, SEEK_SET);
186 186 
 						while((count = cli_readn(desc, buffer, sizeof(buffer))) > 0)