added 'Empty junk' context menu to Junk folder.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2640 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 397 insertions, 363 deletions

diff --git a/po/fr.po b/po/fr.po
index d584561e..24cb783f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-06-19 02:21+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -328,7 +328,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -516,11 +516,11 @@ msgstr "Trouvé %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Tri (manuel) des indésirables"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -664,7 +664,7 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -702,7 +702,7 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -843,8 +843,8 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -852,32 +852,32 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -885,190 +885,190 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1078,37 +1078,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Échec lors de la conversion de l'ancien carnet d'adresses.\n"
 "Création d'un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses.\n"
 "Impossible de créer un nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,15 +1140,15 @@ msgstr ""
 "Échec lors de la conversion du carnet d'adresses\n"
 "et lors de la création d'un nouveau carnet d'adresses."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1159,78 +1159,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Ancien carnet d'adresses converti, mais échec lors de l'écriture du fichier "
 "index"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses. Création d'un nouveau "
 "carnet d'adresses vide."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Échec lors de la conversion du carnet d'adresses et lors de la création d'un "
 "nouveau carnet d'adresses vide."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1242,11 +1242,11 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -1293,7 +1293,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Aucun"
 
@@ -1309,8 +1309,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -1384,7 +1384,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Affichage"
 
@@ -1635,7 +1635,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1676,7 +1676,7 @@ msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Sujet :"
 
@@ -1826,7 +1826,7 @@ msgstr "Type MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Taille"
 
@@ -1957,28 +1957,28 @@ msgstr "Un nom et une valeur doivent être donnés."
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Surnom"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2092,12 +2092,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2114,7 +2114,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2297,194 +2297,200 @@ msgstr "Le fichier existe déjà. Voulez-vous le remplacer ?"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Indésirable"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Déplacer le dossier..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Vider la corbeille"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Mettre à jo_ur le résumé des messages"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Marquer comme _lu"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/_Envoyer les messages en attente"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Recherc_her dans le dossier..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Mod_ifier le motif de recherche..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Indésirable"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Téléchargement de tous les messages dans '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Téléchargement de tous les messages"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2494,26 +2500,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2522,11 +2528,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2539,20 +2545,30 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Acceptable"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Effacer tous les messages dans la corbeille ?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2561,34 +2577,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2601,7 +2617,7 @@ msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2672,114 +2688,114 @@ msgstr "Choix du dossier à importer"
 msgid "Select importing file"
 msgstr "Choix du fichier à importer"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Entrer le nom du nouveau carnet d'adresses et celui du fichier à importer."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Sélectionner et modifier l'ordre des champs CSV à importer."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fichier importé."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Veuillez sélectionner une fichier."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Le nom du carnet d'adresses doit être indiqué."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Erreur lors de la lecture des champs CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Fichier CSV importé avec succès."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Sélection d'un fichier CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nom du fichier"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Spéraration par des virgules"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Ou par des tabulations"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Champ CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Champ du carnet d'adresses"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 "Modifier l'ordre dans le carnet d'adresses avec les boutons Haut et Bas."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Plus haut"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Carnet d'adresses :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nom de fichier :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Enregistrements :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importation d'un fichier CSV dans un carnet d'adresses"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Suivant"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Propriétés du fichier"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Champs"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Terminé"
 
@@ -2957,7 +2973,7 @@ msgstr "Fermeture"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3052,16 +3068,16 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3072,24 +3088,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3097,50 +3113,50 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 "  --open [id dossier]/[numéro du message] ouvrir le message dans une "
 "nouvelle fenêtre"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dossier    indiquer le dossier contenant les fichiers de "
 "configuration"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      spécifier le port pour les commandes IPC distantes"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 quitter Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Appuyez sur une touche..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3164,23 +3180,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3188,20 +3204,20 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Chargement des plug-ins..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3547,15 +3563,15 @@ msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/Ouv_rir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
@@ -3854,8 +3870,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3923,7 +3939,7 @@ msgstr "Sylpheed - Dossiers"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Répondre"
 
@@ -3939,15 +3955,15 @@ msgstr "/Répondre à l'_expéditeur"
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
@@ -3991,19 +4007,19 @@ msgstr "Quitter Sylpheed ?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Choix d'un dossier à ouvrir"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4033,7 +4049,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4064,15 +4080,15 @@ msgstr ""
 "afficher l'aide-mémoire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr "spécifier le port pour les commandes IPC distantes"
 
@@ -4129,7 +4145,7 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -4150,7 +4166,7 @@ msgstr "/Enregistrer so_us..."
 msgid "/Save _all..."
 msgstr "/_Tout enregistrer..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Im_primer..."
 
@@ -4542,7 +4558,7 @@ msgstr "Texte"
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
@@ -4796,7 +4812,7 @@ msgstr " Aide "
 msgid "Registered actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nouveau)"
 
@@ -6161,28 +6177,28 @@ msgstr "Type"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Ne pas afficher [...] ou (...) au début du sujet dans le résumé"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Supprimer [...] ou (...) au début du sujet lors d'une réponse"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Compte"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "utiliser également pour les réponses"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
@@ -6218,19 +6234,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Date"
 
@@ -6240,7 +6256,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "À"
 
@@ -6261,43 +6277,61 @@ msgstr ""
 "modifier leur disposition, faîtes les glisser à l'aide de la souris\n"
 "ou utilisez les boutons « Plus haut » et « Plus bas »."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Enregistrer"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Remplacer "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symboles "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Modèles enregistrés"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nom du modèle"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nom du modèle"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Modèle"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Erreur de format dans le modèle."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
@@ -6532,7 +6566,7 @@ msgstr "Recherche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Recherche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6629,7 +6663,7 @@ msgstr "À _propos"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - boîte POP3 à distance"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "N°"
 
@@ -7192,7 +7226,7 @@ msgstr "Récupération de la liste des groupes de discussion..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Terminé."
 
@@ -7201,346 +7235,346 @@ msgstr "Terminé."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Rép_ondre à"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Rép_ondre à/_tous"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Rép_ondre à/l'_expéditeur"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Rép_ondre à/la _liste"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Déplacer..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copier..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marquer"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marquer/_Marquer"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marquer/_Démarquer"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marquer/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marquer/Marquer comme _non lu"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marquer/Marquer comme _lu"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marquer/Marquer le _fil comme lu"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marquer/Marquer _tous comme lus"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Marquer comme indésira_ble"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Marquer comme acc_eptable"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Réédit_er"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Ajouter l'e_xpéditeur au carnet d'adresses..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Créer une règle de f_iltrage"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Création de la vue de l'index...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Analyse du dossier (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Impossible d'établir un session IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Pas de message non lu. Passer au dossier non lu suivant ?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Plus de nouveaux messages. Aller au prochain dossier avec des nouveaux "
 "messages?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Choisir le dossier à déplacer"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Choisir le dossier à copier"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."