- added code to allow check_tcp (via np_net_connect) work with local

  unix sockets.  some testing would be welcome.  based on idea from
  Alex Samorukov.
- also introduced a check_clamd behavior in check_tcp.


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1261 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 169 insertions, 177 deletions

diff --git a/po/fr.po b/po/fr.po
index 16193191..a711a68f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,26 +8,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-21 20:00+1100\n"
+"POT-Creation-Date: 2004-12-30 01:03+0100\n"
 "PO-Revision-Date: 2004-12-30 01:39+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #: plugins/check_by_ssh.c:72 plugins/check_dhcp.c:251 plugins/check_dig.c:72
 #: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:43
 #: plugins/check_fping.c:73 plugins/check_game.c:69 plugins/check_hpjd.c:89
-#: plugins/check_http.c:150 plugins/check_ldap.c:92 plugins/check_load.c:78
+#: plugins/check_http.c:149 plugins/check_ldap.c:92 plugins/check_load.c:78
 #: plugins/check_mrtgtraf.c:66 plugins/check_mysql.c:63
 #: plugins/check_nagios.c:70 plugins/check_nt.c:120 plugins/check_nwstat.c:125
 #: plugins/check_overcr.c:89 plugins/check_pgsql.c:140 plugins/check_ping.c:82
 #: plugins/check_procs.c:124 plugins/check_radius.c:117
-#: plugins/check_real.c:68 plugins/check_smtp.c:129 plugins/check_snmp.c:163
+#: plugins/check_real.c:68 plugins/check_smtp.c:129 plugins/check_snmp.c:160
 #: plugins/check_ssh.c:61 plugins/check_swap.c:93 plugins/check_tcp.c:243
 #: plugins/check_time.c:66 plugins/check_udp.c:55 plugins/check_ups.c:114
 #: plugins/check_users.c:54 plugins/negate.c:87
@@ -43,7 +43,7 @@ msgstr "impossible d'obtenir le signal SIGALRM"
 #: plugins/check_by_ssh.c:88 plugins/check_dig.c:93 plugins/check_dns.c:90
 #: plugins/check_fping.c:87 plugins/check_game.c:86 plugins/check_hpjd.c:114
 #: plugins/check_nagios.c:103 plugins/check_ping.c:406
-#: plugins/check_procs.c:137 plugins/check_snmp.c:175 plugins/check_swap.c:151
+#: plugins/check_procs.c:137 plugins/check_snmp.c:172 plugins/check_swap.c:151
 #: plugins/check_users.c:59 plugins/negate.c:97 plugins/urlize.c:88
 #, c-format
 msgid "Could not open pipe: %s\n"
@@ -52,7 +52,7 @@ msgstr "Impossible d'ouvrir le pipe: %s\n"
 #: plugins/check_by_ssh.c:96 plugins/check_dig.c:99 plugins/check_dns.c:96
 #: plugins/check_fping.c:93 plugins/check_hpjd.c:120 plugins/check_load.c:115
 #: plugins/check_nagios.c:109 plugins/check_procs.c:143
-#: plugins/check_snmp.c:181 plugins/check_swap.c:157 plugins/check_users.c:65
+#: plugins/check_snmp.c:178 plugins/check_swap.c:157 plugins/check_users.c:65
 #: plugins/negate.c:102 plugins/urlize.c:94
 #, c-format
 msgid "Could not open stderr for %s\n"
@@ -66,25 +66,25 @@ msgstr "SSH ALERTE: impossible d'ouvrir %s\n"
 #: plugins/check_by_ssh.c:216 plugins/check_dhcp.c:1063
 #: plugins/check_dig.c:217 plugins/check_disk.c:441 plugins/check_dns.c:315
 #: plugins/check_fping.c:245 plugins/check_game.c:201 plugins/check_hpjd.c:336
-#: plugins/check_http.c:255 plugins/check_ldap.c:315 plugins/check_load.c:227
+#: plugins/check_http.c:254 plugins/check_ldap.c:315 plugins/check_load.c:227
 #: plugins/check_mrtg.c:236 plugins/check_mrtgtraf.c:263
-#: plugins/check_mysql.c:214 plugins/check_nagios.c:222 plugins/check_nt.c:489
+#: plugins/check_mysql.c:214 plugins/check_nagios.c:222 plugins/check_nt.c:490
 #: plugins/check_nwstat.c:763 plugins/check_overcr.c:327
 #: plugins/check_pgsql.c:212 plugins/check_ping.c:197
 #: plugins/check_procs.c:346 plugins/check_radius.c:221
-#: plugins/check_real.c:354 plugins/check_smtp.c:476 plugins/check_snmp.c:406
-#: plugins/check_ssh.c:113 plugins/check_swap.c:426 plugins/check_tcp.c:465
+#: plugins/check_real.c:354 plugins/check_smtp.c:477 plugins/check_snmp.c:401
+#: plugins/check_ssh.c:113 plugins/check_swap.c:423 plugins/check_tcp.c:465
 #: plugins/check_time.c:219 plugins/check_udp.c:149 plugins/check_ups.c:484
-#: plugins/check_users.c:143 plugins/check_ide_smart.c:214
+#: plugins/check_users.c:143 plugins/check_ide_smart.c:209
 #: plugins/negate.c:177 plugins/urlize.c:74
 msgid "Unknown argument"
 msgstr "Argument inconnu"
 
 #: plugins/check_by_ssh.c:228 plugins/check_dig.c:264 plugins/check_disk.c:308
-#: plugins/check_http.c:267 plugins/check_ldap.c:268 plugins/check_pgsql.c:221
+#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:221
 #: plugins/check_procs.c:355 plugins/check_radius.c:198
 #: plugins/check_radius.c:268 plugins/check_real.c:344
-#: plugins/check_smtp.c:441 plugins/check_snmp.c:450 plugins/check_ssh.c:125
+#: plugins/check_smtp.c:441 plugins/check_snmp.c:445 plugins/check_ssh.c:125
 #: plugins/check_tcp.c:517 plugins/check_time.c:290 plugins/check_udp.c:180
 #: plugins/check_ups.c:542 plugins/negate.c:188
 msgid "Timeout interval must be a positive integer"
@@ -97,7 +97,7 @@ msgstr "L'intervalle de temps doit être un entier positif"
 #: plugins/check_mysql.c:227 plugins/check_pgsql.c:239
 #: plugins/check_ping.c:268 plugins/check_ping.c:391
 #: plugins/check_radius.c:233 plugins/check_real.c:302
-#: plugins/check_real.c:364 plugins/check_smtp.c:379 plugins/check_smtp.c:486
+#: plugins/check_real.c:364 plugins/check_smtp.c:379 plugins/check_smtp.c:487
 #: plugins/check_ssh.c:144 plugins/check_tcp.c:487 plugins/check_time.c:228
 #: plugins/check_time.c:303 plugins/check_udp.c:161 plugins/check_udp.c:202
 #: plugins/check_ups.c:490 plugins/check_ups.c:559
@@ -640,11 +640,11 @@ msgstr ""
 msgid "%s [%s not found]"
 msgstr "%s [%s non trouvé]"
 
-#: plugins/check_disk.c:325 plugins/check_swap.c:394
+#: plugins/check_disk.c:325 plugins/check_swap.c:391
 msgid "Warning threshold must be integer or percentage!"
 msgstr "Le seuil d'alerte doit être un entier positif!"
 
-#: plugins/check_disk.c:342 plugins/check_swap.c:411
+#: plugins/check_disk.c:342 plugins/check_swap.c:408
 msgid "Critical threshold must be integer or percentage!"
 msgstr "Le seuil critique doit être un entier positif!"
 
@@ -817,8 +817,8 @@ msgstr "j'attendais %s mais j'ai reçu %s"
 msgid "server %s is not authoritative for %s"
 msgstr "Le serveur %s est autoritaire pour %s"
 
-#: plugins/check_dns.c:202 plugins/check_dummy.c:59 plugins/check_http.c:999
-#: plugins/check_http.c:1257 plugins/check_procs.c:279
+#: plugins/check_dns.c:202 plugins/check_dummy.c:59 plugins/check_http.c:930
+#: plugins/check_http.c:1183 plugins/check_procs.c:279
 #, c-format
 msgid "OK"
 msgstr "OK"
@@ -956,19 +956,17 @@ msgstr ""
 msgid "Arguments to check_dummy must be an integer"
 msgstr "Les arguments pour check_dummy doivent être des entiers"
 
-#: plugins/check_dummy.c:62 plugins/check_http.c:1001
-#: plugins/check_procs.c:281
+#: plugins/check_dummy.c:62 plugins/check_http.c:932 plugins/check_procs.c:281
 #, c-format
 msgid "WARNING"
 msgstr "ALERTE"
 
-#: plugins/check_dummy.c:65 plugins/check_http.c:1003
-#: plugins/check_procs.c:286
+#: plugins/check_dummy.c:65 plugins/check_http.c:934 plugins/check_procs.c:286
 #, c-format
 msgid "CRITICAL"
 msgstr "CRITIQUE"
 
-#: plugins/check_dummy.c:68 plugins/check_http.c:997
+#: plugins/check_dummy.c:68 plugins/check_http.c:928
 #, c-format
 msgid "UNKNOWN"
 msgstr "INCONNU"
@@ -1226,269 +1224,264 @@ msgstr ""
 " -C, --community=STRING\n"
 "    La communauté SNMP (défaut=%s)\n"
 
-#: plugins/check_http.c:172
+#: plugins/check_http.c:171
 msgid "HTTP CRITICAL - Could not make SSL connection\n"
 msgstr "HTTP CRITIQUE - Impossible d'établir une connection SSL\n"
 
-#: plugins/check_http.c:178 plugins/check_http.c:807 plugins/check_smtp.c:200
+#: plugins/check_http.c:177 plugins/check_http.c:739 plugins/check_smtp.c:200
 #: plugins/check_tcp.c:268
 #, c-format
 msgid "CRITICAL - Cannot retrieve server certificate.\n"
 msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
 
-#: plugins/check_http.c:273
+#: plugins/check_http.c:272
 msgid "Critical threshold must be integer"
 msgstr "l'intervalle critique doit être un entier positif"
 
-#: plugins/check_http.c:281
+#: plugins/check_http.c:280
 msgid "Warning threshold must be integer"
 msgstr "Le seuil d'alerte doit être un entier positif"
 
-#: plugins/check_http.c:301 plugins/check_http.c:316 plugins/check_tcp.c:584
+#: plugins/check_http.c:300 plugins/check_http.c:315 plugins/check_tcp.c:584
 msgid "Invalid option - SSL is not available"
 msgstr "Option invalide - SSL n'est pas disponible"
 
-#: plugins/check_http.c:310 plugins/check_tcp.c:576
+#: plugins/check_http.c:309 plugins/check_tcp.c:576
 msgid "Invalid certificate expiration period"
 msgstr "Période d'expiration du certificat invalide"
 
-#: plugins/check_http.c:331
+#: plugins/check_http.c:330
 #, c-format
 msgid "option f:%d \n"
 msgstr "option f:%d \n"
 
-#: plugins/check_http.c:348
+#: plugins/check_http.c:347
 msgid "Invalid port number"
 msgstr "Numéro de port invalide"
 
-#: plugins/check_http.c:379 plugins/check_snmp.c:287
+#: plugins/check_http.c:378 plugins/check_snmp.c:284
 #, c-format
 msgid "Call for regex which was not a compiled option"
 msgstr "Demande d'utilisation d'un regex qui n'est pas prévu dans le programme"
 
-#: plugins/check_http.c:393
+#: plugins/check_http.c:392
 #, c-format
 msgid "Could Not Compile Regular Expression: %s"
 msgstr "Impossible de compiler l'expression régulière: %s"
 
-#: plugins/check_http.c:405 plugins/check_smtp.c:466 plugins/check_ssh.c:136
+#: plugins/check_http.c:404 plugins/check_smtp.c:467 plugins/check_ssh.c:136
 #: plugins/check_tcp.c:482
 msgid "IPv6 support not available"
 msgstr "Support IPv6 non disponible"
 
-#: plugins/check_http.c:467
+#: plugins/check_http.c:447
 msgid "You must specify a server address or host name"
 msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
 
-#: plugins/check_http.c:693
+#: plugins/check_http.c:673
 msgid "Server date unknown\n"
 msgstr "Date du serveur inconnue\n"
 
-#: plugins/check_http.c:695
+#: plugins/check_http.c:675
 msgid "Document modification date unknown\n"
 msgstr "Date de modification du document inconnue\n"
 
-#: plugins/check_http.c:701
+#: plugins/check_http.c:681
 #, c-format
 msgid "CRITICAL - Server date \"%100s\" unparsable"
 msgstr "CRITIQUE - Date du serveur \"%100s\" illisible"
 
-#: plugins/check_http.c:703
+#: plugins/check_http.c:683
 #, c-format
 msgid "CRITICAL - Document date \"%100s\" unparsable"
 msgstr "CRITIQUE - Date du document \"%100s\" illisible"
 
-#: plugins/check_http.c:705
+#: plugins/check_http.c:685
 #, c-format
 msgid "CRITICAL - Document is %d seconds in the future\n"
 msgstr "CRITIQUE - La date du document est %d secondes dans le futur\n"
 
-#: plugins/check_http.c:710
+#: plugins/check_http.c:690
 #, c-format
 msgid "CRITICAL - Last modified %.1f days ago\n"
 msgstr "CRITIQUE - Dernière modification %.1f jours auparavant\n"
 
-#: plugins/check_http.c:714
+#: plugins/check_http.c:694
 #, c-format
 msgid "CRITICAL - Last modified %d:%02d:%02d ago\n"
 msgstr "CRITIQUE - Dernière modification %d:%02d:%02d auparavant\n"
 
-#: plugins/check_http.c:800 plugins/check_http.c:815
+#: plugins/check_http.c:732 plugins/check_http.c:747
 msgid "Unable to open TCP socket\n"
 msgstr "Impossible d'ouvrir un socket TCP\n"
 
-#: plugins/check_http.c:889
+#: plugins/check_http.c:820
 msgid "Client Certificate Required\n"
 msgstr "Un certificat client est nécessaire\n"
 
-#: plugins/check_http.c:891 plugins/check_http.c:896
+#: plugins/check_http.c:822 plugins/check_http.c:827
 msgid "Error on receive\n"
 msgstr "Erreur dans la réception\n"
 
-#: plugins/check_http.c:904
+#: plugins/check_http.c:835
 #, c-format
 msgid "No data received %s\n"
 msgstr "Pas de données reçues %s\n"
 
-#: plugins/check_http.c:951
+#: plugins/check_http.c:882
 msgid "Invalid HTTP response received from host\n"
 msgstr "Réponse HTTP invalide reçue de l'hôte\n"
 
-#: plugins/check_http.c:954
+#: plugins/check_http.c:885
 #, c-format
 msgid "Invalid HTTP response received from host on port %d\n"
 msgstr "Réponse HTTP invalide reçue de l'hôte sur le port %d\n"
 
-#: plugins/check_http.c:962
+#: plugins/check_http.c:893
 #, c-format
 msgid "HTTP OK: Status line output matched \"%s\"\n"
 msgstr "HTTP OK: La ligne d'état correspond à \"%s\"\n"
 
-#: plugins/check_http.c:974
+#: plugins/check_http.c:905
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
 msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n"
 
-#: plugins/check_http.c:981
+#: plugins/check_http.c:912
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status (%s)\n"
 msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n"
 
-#: plugins/check_http.c:985
+#: plugins/check_http.c:916
 #, c-format
 msgid "HTTP CRITICAL: %s\n"
 msgstr "HTTP CRITIQUE: %s\n"
 
-#: plugins/check_http.c:989
+#: plugins/check_http.c:920
 #, c-format
 msgid "HTTP WARNING: %s\n"
 msgstr "HTTP ALERTE: %s\n"
 
-#: plugins/check_http.c:1007
+#: plugins/check_http.c:938
 #, c-format
 msgid " - %s - %.3f second response time %s%s|%s %s\n"
 msgstr " - %s - %.3f secondes de temps de réponse %s%s|%s %s\n"
 
-#: plugins/check_http.c:1023
+#: plugins/check_http.c:954
 #, c-format
 msgid "HTTP WARNING: %s - %.3f second response time %s%s|%s %s\n"
 msgstr "HTTP ALERTE %s - %.3f secondes de temps de réponse %s%s|%s %s\n"
 
-#: plugins/check_http.c:1037 plugins/check_http.c:1054
+#: plugins/check_http.c:968 plugins/check_http.c:985
 #, c-format
 msgid "HTTP OK %s - %.3f second response time %s%s|%s %s\n"
 msgstr "HTTP OK %s - %.3f secondes de temps de réponse %s%s|%s %s\n"
 
-#: plugins/check_http.c:1044
+#: plugins/check_http.c:975
 #, c-format
 msgid "CRITICAL - string not found%s|%s %s\n"
 msgstr "CRITIQUE - chaîne non trouvée%s|%s %s\n"
 
-#: plugins/check_http.c:1062
+#: plugins/check_http.c:993
 #, c-format
 msgid "CRITICAL - pattern not found%s|%s %s\n"
 msgstr "CRITIQUE - chaîne non trouvée %s|%s %s\n"
 
-#: plugins/check_http.c:1069
+#: plugins/check_http.c:1000
 #, c-format
 msgid "CRITICAL - Execute Error: %s\n"
 msgstr "CRITIQUE - Erreur d'exécution: %s\n"
 
-#: plugins/check_http.c:1080
-#, fuzzy, c-format
-msgid "HTTP WARNING: page size %d too large%s|%s\n"
-msgstr "HTTP ALERTE: la taille de la page %d est trop petite%s|%s\n"
-
-#: plugins/check_http.c:1084
+#: plugins/check_http.c:1010
 #, c-format
 msgid "HTTP WARNING: page size %d too small%s|%s\n"
 msgstr "HTTP ALERTE: la taille de la page %d est trop petite%s|%s\n"
 
-#: plugins/check_http.c:1089
+#: plugins/check_http.c:1015
 #, c-format
 msgid "HTTP OK %s - %d bytes in %.3f seconds %s%s|%s %s\n"
 msgstr "HTTP OK %s - %d bytes en %.3f secondes %s%s|%s %s\n"
 
-#: plugins/check_http.c:1124
+#: plugins/check_http.c:1050
 msgid "Could not allocate addr\n"
 msgstr "Impossible d'allouer une adresse\n"
 
-#: plugins/check_http.c:1128
+#: plugins/check_http.c:1054
 msgid "Could not allocate url\n"
 msgstr "Impossible d'allouer une URL\n"
 
-#: plugins/check_http.c:1138
+#: plugins/check_http.c:1064
 #, c-format
 msgid "UNKNOWN - Could not find redirect location - %s%s\n"
 msgstr "INCONNU - Impossible de trouver l'endroit de la relocation - %s%s\n"
 
-#: plugins/check_http.c:1148
+#: plugins/check_http.c:1074
 msgid "could not allocate url\n"
 msgstr "Impossible d'allouer une URL\n"
 
-#: plugins/check_http.c:1191
+#: plugins/check_http.c:1117
 #, c-format
 msgid "UNKNOWN - Could not parse redirect location - %s%s\n"
 msgstr "INCONNU - Impossible de définir l'endroit de la relocation - %s%s\n"
 
-#: plugins/check_http.c:1201
+#: plugins/check_http.c:1127
 #, c-format
 msgid "WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
 msgstr ""
 "ALERTE - le niveau maximum de redirection %d à été dépassé - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1209
+#: plugins/check_http.c:1135
 #, c-format
 msgid "WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
 msgstr "ALERTE - la redirection crée une boucle infinie - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1257
+#: plugins/check_http.c:1183
 #, c-format
 msgid "SSL seeding: %s\n"
 msgstr "Randomisation SSL: %s\n"
 
-#: plugins/check_http.c:1257
+#: plugins/check_http.c:1183
 msgid "Failed"
 msgstr "Échoué"
 
-#: plugins/check_http.c:1264
+#: plugins/check_http.c:1190
 #, c-format
 msgid "CRITICAL -  Cannot create SSL context.\n"
 msgstr "CRITIQUE -  Impossible de créer le contexte SSL.\n"
 
-#: plugins/check_http.c:1288 plugins/check_smtp.c:608 plugins/check_tcp.c:640
+#: plugins/check_http.c:1214 plugins/check_smtp.c:609 plugins/check_tcp.c:640
 #, c-format
 msgid "CRITICAL - Cannot initiate SSL handshake.\n"
 msgstr "CRITIQUE - Impossible d'initialiser la négociation SSL.\n"
 
-#: plugins/check_http.c:1318 plugins/check_http.c:1330
-#: plugins/check_smtp.c:634 plugins/check_smtp.c:646 plugins/check_tcp.c:670
+#: plugins/check_http.c:1244 plugins/check_http.c:1256
+#: plugins/check_smtp.c:635 plugins/check_smtp.c:647 plugins/check_tcp.c:670
 #: plugins/check_tcp.c:682
 #, c-format
 msgid "CRITICAL - Wrong time format in certificate.\n"
 msgstr "CRITIQUE - Format de date incorrect dans le certificat.\n"
 
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1285
 #, c-format
 msgid "WARNING - Certificate expires in %d day(s) (%s).\n"
 msgstr "ALERTE - Le certificat expire dans %d jour(s) (%s).\n"
 
-#: plugins/check_http.c:1363
+#: plugins/check_http.c:1289
 #, c-format
 msgid "CRITICAL - Certificate expired on %s.\n"
 msgstr "CRITIQUE - Le certificat à expiré le %s.\n"
 
-#: plugins/check_http.c:1368
+#: plugins/check_http.c:1294
 #, c-format
 msgid "WARNING - Certificate expires today (%s).\n"
 msgstr "ALERTE - Le certificat expires aujourd'hui (%s).\n"
 
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1298
 #, c-format
 msgid "OK - Certificate will expire on %s.\n"
 msgstr "OK - Le certificat expirera le %s.\n"
 
-#: plugins/check_http.c:1447
+#: plugins/check_http.c:1373
 #, c-format
 msgid ""
 "This plugin tests the HTTP service on the specified host. It can test\n"
@@ -1505,12 +1498,12 @@ msgstr ""
 "certificats.\n"
 "\n"
 
-#: plugins/check_http.c:1455
+#: plugins/check_http.c:1381
 #, c-format
 msgid "NOTE: One or both of -H and -I must be specified\n"
 msgstr "NOTE: un ou les deux peuvent être spécifiés -H et -I\n"
 
-#: plugins/check_http.c:1459
+#: plugins/check_http.c:1385
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -1532,7 +1525,7 @@ msgstr ""
 " -p, --port=INTEGER\n"
 "   Numéro du port (défaut: %d)\n"
 
-#: plugins/check_http.c:1471
+#: plugins/check_http.c:1397
 #, c-format
 msgid ""
 " -S, --ssl\n"
@@ -1547,7 +1540,7 @@ msgstr ""
 "    Nombre minimum de jours de validité du certificat.\n"
 "    (quand cette option est utilisée, l'URL n'est pas vérifiée.)\n"
 
-#: plugins/check_http.c:1479
+#: plugins/check_http.c:1405
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -1570,7 +1563,7 @@ msgid ""
 "   specify Content-Type header media type when POSTing\n"
 msgstr ""
 
-#: plugins/check_http.c:1499
+#: plugins/check_http.c:1425
 #, c-format
 msgid ""
 " -l, --linespan\n"
@@ -1581,7 +1574,7 @@ msgid ""
 "    Search page for case-insensitive regex STRING\n"
 msgstr ""
 
-#: plugins/check_http.c:1508
+#: plugins/check_http.c:1434
 #, c-format
 msgid ""
 " -a, --authorization=AUTH_PAIR\n"
@@ -1594,11 +1587,11 @@ msgid ""
 "   Wrap output in HTML link (obsoleted by urlize)\n"
 " -f, --onredirect=<ok|warning|critical|follow>\n"
 "   How to handle redirected pages\n"
-" -m, --pagesize=INTEGER<:INTEGER>\n"
-"   Minimum page size required (bytes) : Maximum page size required (bytes)\n"
+" -m, --min=INTEGER\n"
+"   Minimum page size required (bytes)\n"
 msgstr ""
 
-#: plugins/check_http.c:1528
+#: plugins/check_http.c:1454
 #, c-format
 msgid ""
 "This plugin will attempt to open an HTTP connection with the host. "
@@ -1618,7 +1611,7 @@ msgstr ""
 "hosting virtuel qui utilise des 'host headers' vous devrez fournir le FQDN\n"
 "(nom de domaine qualifié) comme l'argument [host_name].\n"
 
-#: plugins/check_http.c:1537
+#: plugins/check_http.c:1463
 #, c-format
 msgid ""
 "\n"
@@ -1631,7 +1624,7 @@ msgstr ""
 "le contenu (éventuellement dans un temps défini) ou si le certificat X509\n"
 "est toujours valide pour le nombre de jours spécifiés.\n"
 
-#: plugins/check_http.c:1541
+#: plugins/check_http.c:1467
 #, c-format
 msgid ""
 "\n"
@@ -1655,7 +1648,7 @@ msgstr ""
 "STATE_CRITICAL sera retourné.\n"
 "\n"
 
-#: plugins/check_http.c:1548
+#: plugins/check_http.c:1474
 #, c-format
 msgid ""
 "CHECK CERTIFICATE: check_http www.verisign.com -C 14\n"
@@ -2548,7 +2541,7 @@ msgstr ""
 msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 
-#: plugins/check_nt.c:309 plugins/check_nt.c:395
+#: plugins/check_nt.c:309 plugins/check_nt.c:396
 msgid "No counter specified"
 msgstr "Pas de compteur spécifié"
 
@@ -2564,23 +2557,23 @@ msgstr "La valeur maximum contient des caractères non numériques"
 msgid "No unit counter specified"
 msgstr "Pas de compteur spécifié"
 
-#: plugins/check_nt.c:425
+#: plugins/check_nt.c:426
 msgid "Please specify a variable to check"
 msgstr "Veuillez préciser une variable a vérifier"
 
-#: plugins/check_nt.c:507
+#: plugins/check_nt.c:508
 msgid "Server port must be an integer\n"
 msgstr "Le port du serveur doit être un nombre entier\n"
 
-#: plugins/check_nt.c:560
+#: plugins/check_nt.c:561
 msgid "None"
 msgstr "Aucun"
 
-#: plugins/check_nt.c:573
+#: plugins/check_nt.c:574
 msgid "could not fetch information from server\n"
 msgstr "Impossible d'obtenir l'information depuis le serveur\n"
 
-#: plugins/check_nt.c:617
+#: plugins/check_nt.c:618
 #, c-format
 msgid ""
 "This plugin collects data from the NSClient service running on a\n"
@@ -2591,7 +2584,7 @@ msgstr ""
 "Windows NT/2000/XP serveur.\n"
 "\n"
 
-#: plugins/check_nt.c:622
+#: plugins/check_nt.c:623
 #, c-format
 msgid ""
 "\n"
@@ -2614,7 +2607,7 @@ msgid ""
 "  Print version information\n"
 msgstr ""
 
-#: plugins/check_nt.c:640
+#: plugins/check_nt.c:641
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
@@ -2623,7 +2616,7 @@ msgstr ""
 "-v, --variable=STRING\n"
 "  Variable à vérifier.  Les variables valides sont:\n"
 
-#: plugins/check_nt.c:643
+#: plugins/check_nt.c:644
 #, c-format
 msgid ""
 "   CLIENTVERSION = Get the NSClient version\n"
@@ -2632,7 +2625,7 @@ msgstr ""
 "   CLIENTVERSION = Obtenir la version de NSClient\n"
 "     si l'argument -l <version> est spécifié, une alerte sera renvoyée.\n"
 
-#: plugins/check_nt.c:646
+#: plugins/check_nt.c:647
 #, c-format
 msgid ""
 "   CPULOAD = Average CPU load on last x minutes.\n"
@@ -2644,7 +2637,7 @@ msgid ""
 "     ie: -l 60,90,95,120,90,95\n"
 msgstr ""
 
-#: plugins/check_nt.c:653
+#: plugins/check_nt.c:654
 #, c-format
 msgid ""
 "   UPTIME = Get the uptime of the machine.\n"
@@ -2653,7 +2646,7 @@ msgstr ""
 "   UPTIME = Obtenir la durée de bon fonctionnement de la machine.\n"
 "     Pas d'argument spécifique. Pas de seuil d'alerte ou critique\n"
 
-#: plugins/check_nt.c:656
+#: plugins/check_nt.c:657
 #, c-format
 msgid ""
 "   USEDDISKSPACE = Size and percentage of disk use.\n"
@@ -2661,7 +2654,7 @@ msgid ""
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:660
+#: plugins/check_nt.c:661
 #, c-format
 msgid ""
 "   MEMUSE = Memory use.\n"
@@ -2670,7 +2663,7 @@ msgstr ""
 "   MEMUSE = Utilisation mémoire.\n"
 "     Les seuil d'alerte et critiques peuvent être spécifiés avec -w et -c.\n"
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:664
 #, c-format
 msgid ""
 "   SERVICESTATE = Check the state of one or several services.\n"
@@ -2680,7 +2673,7 @@ msgid ""
 "\t\t in the returned string.\n"
 msgstr ""
 
-#: plugins/check_nt.c:669
+#: plugins/check_nt.c:670
 #, c-format
 msgid ""
 "   PROCSTATE = Check if one or several process are running.\n"
@@ -2689,7 +2682,7 @@ msgstr ""
 "   PROCSTATE = Vérifie si un ou plusieurs processus sont démarrés.\n"
 "     même syntaxe que SERVICESTATE.\n"
 
-#: plugins/check_nt.c:672
+#: plugins/check_nt.c:673
 #, c-format
 msgid ""
 "   COUNTER = Check any performance counter of Windows NT/2000.\n"
@@ -2703,7 +2696,7 @@ msgid ""
 "       \"%%.f %%%% paging file used.\"\n"
 msgstr ""
 
-#: plugins/check_nt.c:682
+#: plugins/check_nt.c:683
 #, c-format
 msgid ""
 "Notes:\n"
@@ -3806,12 +3799,12 @@ msgstr "Réponse SMTP invalide reçue de l'hôte sur le port %d\n"
 msgid "Server does not support STARTTLS\n"
 msgstr ""
 
-#: plugins/check_smtp.c:191 plugins/check_smtp.c:593 plugins/check_tcp.c:611
+#: plugins/check_smtp.c:191 plugins/check_smtp.c:594 plugins/check_tcp.c:611
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n"
 
-#: plugins/check_smtp.c:262 plugins/check_snmp.c:518
+#: plugins/check_smtp.c:262 plugins/check_snmp.c:508
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr "Impossible de compiler l'expression régulière"
@@ -3821,7 +3814,7 @@ msgstr "Impossible de compiler l'expression régulière"
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n"
 
-#: plugins/check_smtp.c:275 plugins/check_snmp.c:280
+#: plugins/check_smtp.c:275 plugins/check_snmp.c:277
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr "Erreur d'exécution: %s\n"
@@ -3836,11 +3829,7 @@ msgstr "SMTP %s - %.3f sec. de temps de réponse%s%s|%s\n"
 msgid "Could not realloc() units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_smtp.c:456
-msgid "SSL support not available - install OpenSSL and recompile"
-msgstr ""
-
-#: plugins/check_smtp.c:526
+#: plugins/check_smtp.c:527
 #, c-format
 msgid ""
 "This plugin will attempt to open an SMTP connection with the host.\n"
@@ -3849,7 +3838,7 @@ msgstr ""
 "Ce plugin va essayer d'ouvrir un connection SMTP avec l'hôte.\n"
 "\n"
 
-#: plugins/check_smtp.c:536
+#: plugins/check_smtp.c:537
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -3864,7 +3853,7 @@ msgid ""
 "   FROM-address to include in MAIL command, required by Exchange 2000\n"
 msgstr ""
 
-#: plugins/check_smtp.c:549
+#: plugins/check_smtp.c:550
 #, c-format
 msgid ""
 " -D, --certificate=INTEGER\n"
@@ -3877,7 +3866,7 @@ msgstr ""
 " -S, --starttls\n"
 "    Utilisez STARTTLS pour la connection.\n"
 
-#: plugins/check_smtp.c:562
+#: plugins/check_smtp.c:563
 #, c-format
 msgid ""
 "\n"
@@ -3887,74 +3876,69 @@ msgid ""
 "STATE_WARNING return values.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:257
+#: plugins/check_snmp.c:254
 msgid "No valid data returned"
 msgstr "Pas de données valides reçues"
 
-#: plugins/check_snmp.c:324 plugins/negate.c:113
+#: plugins/check_snmp.c:321 plugins/negate.c:113
 #, c-format
 msgid ""
 "%s problem - No data received from host\n"
 "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:458
+#: plugins/check_snmp.c:453
 #, c-format
 msgid "Invalid critical threshold: %s\n"
 msgstr "Seuil critique invalide: %s\n"
 
-#: plugins/check_snmp.c:469
+#: plugins/check_snmp.c:464
 #, c-format
 msgid "Invalid warning threshold: %s\n"
 msgstr "Seuil d'alerte invalide: %s\n"
 
-#: plugins/check_snmp.c:481
-#, fuzzy
-msgid "Retries interval must be a positive integer"
-msgstr "L'intervalle de temps doit être un entier positif"
-
-#: plugins/check_snmp.c:524
+#: plugins/check_snmp.c:514
 #, c-format
 msgid "call for regex which was not a compiled option"
 msgstr "Demande d'utilisation d'un regex qui n'est pas prévu dans le programme"
 
-#: plugins/check_snmp.c:543
+#: plugins/check_snmp.c:533
 #, fuzzy, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Impossible de réallouer des labels[%d]"
 
-#: plugins/check_snmp.c:555
+#: plugins/check_snmp.c:545
 msgid "Could not reallocate labels\n"
 msgstr "Impossible de réallouer des labels\n"
 
-#: plugins/check_snmp.c:572
+#: plugins/check_snmp.c:562
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_snmp.c:584
+#: plugins/check_snmp.c:574
 msgid "Could not realloc() units\n"
 msgstr "Impossible de réallouer des unités\n"
 
-#: plugins/check_snmp.c:657
+#: plugins/check_snmp.c:647
 #, c-format
 msgid "Missing secname (%s) or authpassword (%s) ! \n"
 msgstr "Manque secname (%s) ou mot de passe (%s) ! \n"
 
-#: plugins/check_snmp.c:665
+#: plugins/check_snmp.c:655
 #, c-format
 msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"
 msgstr ""
 
-#: plugins/check_snmp.c:674
+#: plugins/check_snmp.c:664
 msgid "Invalid SNMP version"
 msgstr "Version de SNMP invalide"
 
-#: plugins/check_snmp.c:802
+#: plugins/check_snmp.c:792
 msgid "Unbalanced quotes\n"
 msgstr ""
 
-#: plugins/check_snmp.c:851
+#: plugins/check_snmp.c:841
 #, c-format
 msgid ""
 "Check status of remote machines and obtain sustem information via SNMP\n"
@@ -3964,7 +3948,7 @@ msgstr ""
 "SNMP\n"
 "\n"
 
-#: plugins/check_snmp.c:861
+#: plugins/check_snmp.c:851
 #, c-format
 msgid ""
 " -P, --protocol=[1|3]\n"
@@ -3981,7 +3965,7 @@ msgstr ""
 " -a, --authproto=[MD5|SHA]\n"
 "    Protocole d'authenfication SNMPv3\n"
 
-#: plugins/check_snmp.c:870
+#: plugins/check_snmp.c:860
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -3995,7 +3979,7 @@ msgid ""
 "    SNMPv3 crypt passwd (DES)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:882
+#: plugins/check_snmp.c:872
 #, c-format
 msgid ""
 " -o, --oid=OID(s)\n"
@@ -4008,7 +3992,7 @@ msgid ""
 "    to be the data that should be used in the evaluation.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:892
+#: plugins/check_snmp.c:882
 #, c-format
 msgid ""
 " -w, --warning=INTEGER_RANGE(s)\n"
@@ -4017,7 +4001,7 @@ msgid ""
 "    Range(s) which will not result in a CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_snmp.c:899
+#: plugins/check_snmp.c:889
 #, c-format
 msgid ""
 " -s, --string=STRING\n"
@@ -4032,7 +4016,7 @@ msgid ""
 "    Prefix label for output from plugin (default -s 'SNMP')\n"
 msgstr ""
 
-#: plugins/check_snmp.c:910
+#: plugins/check_snmp.c:900
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -4041,7 +4025,7 @@ msgid ""
 "    Separates output on multiple OID requests\n"
 msgstr ""
 
-#: plugins/check_snmp.c:920
+#: plugins/check_snmp.c:910
 #, c-format
 msgid ""
 "\n"
@@ -4057,7 +4041,7 @@ msgstr ""
 "Si vous n'avez pas ce logiciel installé, vous devez le télécharger depuis \n"
 "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin.\n"
 
-#: plugins/check_snmp.c:925
+#: plugins/check_snmp.c:915
 #, c-format
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
@@ -4065,7 +4049,7 @@ msgid ""
 "  internal spaces must be quoted) [max 8 OIDs]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:929
+#: plugins/check_snmp.c:919
 #, c-format
 msgid ""
 "- Ranges are inclusive and are indicated with colons. When specified as\n"
@@ -4075,7 +4059,7 @@ msgid ""
 "  returned if the result is outside the specified range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:935
+#: plugins/check_snmp.c:925
 #, c-format
 msgid ""
 "- If specified in the order 'max:min' a non-OK state will be returned if "
@@ -4083,7 +4067,7 @@ msgid ""
 "  result is within the (inclusive) range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:939
+#: plugins/check_snmp.c:929
 #, c-format
 msgid ""
 "- Upper or lower bounds may be omitted to skip checking the respective "
@@ -4148,32 +4132,32 @@ msgstr "Format: %s\n"
 
 #: plugins/check_swap.c:183
 #, fuzzy, c-format
-msgid "total=%.0f, used=%.0f, free=%.0f\n"
+msgid "total=%d, used=%d, free=%d\n"
 msgstr "total=%d, utilisé=%d, libre=%d\n"
 
 #: plugins/check_swap.c:197
 #, fuzzy, c-format
-msgid "total=%.0f, free=%.0f\n"
+msgid "total=%llu, free=%llu\n"
 msgstr "total=%llu, libre=%llu\n"
 
-#: plugins/check_swap.c:242 plugins/check_swap.c:284
+#: plugins/check_swap.c:242 plugins/check_swap.c:281
 msgid "swapctl failed: "
 msgstr ""
 
-#: plugins/check_swap.c:317
+#: plugins/check_swap.c:314
 #, fuzzy, c-format
-msgid " %d%% free (%.0f MB out of %.0f MB)"
+msgid " %d%% free (%llu MB out of %llu MB)"
 msgstr " %d%% libre (%llu MB sur un total de %llu MB)"
 
-#: plugins/check_swap.c:465
+#: plugins/check_swap.c:462
 msgid "Warning percentage should be more than critical percentage"
 msgstr ""
 
-#: plugins/check_swap.c:469
+#: plugins/check_swap.c:466
 msgid "Warning free space should be more than critical free space"
 msgstr ""
 
-#: plugins/check_swap.c:483
+#: plugins/check_swap.c:480
 #, c-format
 msgid ""
 "Check swap space on local machine.\n"
@@ -4182,7 +4166,7 @@ msgstr ""
 "Vérifie l'espace swap sur la machine locale\n"
 "\n"
 
-#: plugins/check_swap.c:489
+#: plugins/check_swap.c:486
 #, c-format
 msgid ""
 "\n"
@@ -4202,7 +4186,7 @@ msgid ""
 "    Verbose output. Up to 3 levels\n"
 msgstr ""
 
-#: plugins/check_swap.c:503
+#: plugins/check_swap.c:500
 #, c-format
 msgid ""
 "\n"
@@ -4217,7 +4201,7 @@ msgstr ""
 "mémoire\n"
 " vive\n"
 
-#: plugins/check_swap.c:507
+#: plugins/check_swap.c:504
 #, c-format
 msgid ""
 "\n"
@@ -4642,65 +4626,65 @@ msgid ""
 "    Set CRITICAL status if more than INTEGER users are logged in\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:229
+#: plugins/check_ide_smart.c:225
 #, c-format
 msgid "CRITICAL - Couldn't open device: %s\n"
 msgstr "Critique - Impossible d'ouvrir le périphérique: %s\n"
 
-#: plugins/check_ide_smart.c:234
+#: plugins/check_ide_smart.c:230
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr "CRITIQUE - SMART_CMD_ENABLE\n"
 
-#: plugins/check_ide_smart.c:296
+#: plugins/check_ide_smart.c:292
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr "CRITIQUE - SMART_READ_VALUES: %s\n"
 
-#: plugins/check_ide_smart.c:365
+#: plugins/check_ide_smart.c:361
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 "CRITIQUE - %d État de pré-panne %c Détecté! %d/%d les tests on échoués.\n"
 
-#: plugins/check_ide_smart.c:372
+#: plugins/check_ide_smart.c:368
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 "ALERTE -  %d État de pré-panne %s Détecté! %d/%d les tests on échoués.\n"
 
-#: plugins/check_ide_smart.c:379
+#: plugins/check_ide_smart.c:375
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n"
 
-#: plugins/check_ide_smart.c:382
+#: plugins/check_ide_smart.c:378
 #, c-format
 msgid "ERROR - Status '%d' uknown. %d/%d tests passed\n"
 msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
 
-#: plugins/check_ide_smart.c:415
+#: plugins/check_ide_smart.c:411
 #, fuzzy, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 "Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, OffLineTimeout=%d minutes\n"
 
-#: plugins/check_ide_smart.c:421
+#: plugins/check_ide_smart.c:417
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:427
+#: plugins/check_ide_smart.c:423
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr "Revision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n"
 
-#: plugins/check_ide_smart.c:465
+#: plugins/check_ide_smart.c:462
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr "CRITIQUE - %s: %s\n"
 
-#: plugins/check_ide_smart.c:484
+#: plugins/check_ide_smart.c:481
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n"
@@ -4834,3 +4818,11 @@ msgstr ""
 #: plugins/utils.c:475
 msgid "failed malloc in strscat\n"
 msgstr ""
+
+#, fuzzy
+#~ msgid "HTTP WARNING: page size %d too large%s|%s\n"
+#~ msgstr "HTTP ALERTE: la taille de la page %d est trop petite%s|%s\n"
+
+#, fuzzy
+#~ msgid "Retries interval must be a positive integer"
+#~ msgstr "L'intervalle de temps doit être un entier positif"