made 3.1.0beta6 release.

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

1 files changed, 111 insertions, 111 deletions

diff --git a/po/fr.po b/po/fr.po
index 5731981e..d9d95ecf 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-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+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"
@@ -28,6 +28,14 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
+#: libsylph/filter.c:1545
+msgid "Junk mail filter (manual)"
+msgstr "Tri (manuel) des indésirables"
+
+#: libsylph/filter.c:1548
+msgid "Junk mail filter"
+msgstr "Dossier des messages indésirables"
+
 #: libsylph/imap.c:537
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -228,34 +236,34 @@ msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
 
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
 msgid "can't write to temporary file\n"
 msgstr "Impossible d'écrire dans le fichier temporaire\n"
 
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "Réception des messages de %s dans %s...\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 msgid "can't read mbox file.\n"
 msgstr "Impossible de lire le fichier mbox.\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "Format mbox invalide : %s\n"
 
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "mbox mal formée : %s\n"
 
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
 msgid "can't open temporary file\n"
 msgstr "Impossible d'ouvrir un fichier temporaire\n"
 
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -264,43 +272,43 @@ msgstr ""
 "From 'unescaped' trouvé :\n"
 "%s"
 
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "Impossible de créer le fichier verrou %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Utilisation de 'flock' à la place de 'file' si possible\n"
 
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
 #, c-format
 msgid "can't create %s\n"
 msgstr "Impossible de créer %s\n"
 
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "mailbox utilisée par un autre processus, attente...\n"
 
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
 #, c-format
 msgid "can't lock %s\n"
 msgstr "Impossible de verrouiller %s\n"
 
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
 msgid "invalid lock type\n"
 msgstr "Type de verrou invalide\n"
 
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "Impossible de déverrouiller %s\n"
 
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
 msgid "can't truncate mailbox to zero.\n"
 msgstr "Impossible de vider la boîte aux lettres.\n"
 
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
@@ -319,7 +327,7 @@ msgstr "dossier source identique à la destination.\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copie du message %s/%d vers %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -516,14 +524,6 @@ msgstr "Trouvé %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:611
-msgid "Junk mail filter (manual)"
-msgstr "Tri (manuel) des indésirables"
-
-#: libsylph/prefs_common.c:614
-msgid "Junk mail filter"
-msgstr "Dossier des messages indésirables"
-
 #: libsylph/procmime.c:1293
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content() : la conversion de code a échoué.\n"
@@ -1269,15 +1269,15 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
 msgid "Error"
 msgstr "Erreur"
 
@@ -1320,7 +1320,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:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
 msgid "None"
 msgstr "Aucun"
 
@@ -1854,7 +1854,7 @@ msgstr "Date"
 #. S_COL_DATE
 #: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
 msgid "Size"
 msgstr "Taille"
 
@@ -2889,141 +2889,141 @@ msgstr "Attributs"
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed : %d nouveau(x) message(s)"
 
-#: src/inc.c:485
+#: src/inc.c:492
 msgid "Authenticating with POP3"
 msgstr "Authentification POP3"
 
-#: src/inc.c:512
+#: src/inc.c:519
 msgid "Retrieving new messages"
 msgstr "Récupération des nouveaux messages"
 
-#: src/inc.c:514
+#: src/inc.c:521
 #, fuzzy
 msgid "Cancel _all"
 msgstr "Annuler"
 
-#: src/inc.c:560
+#: src/inc.c:567
 msgid "Standby"
 msgstr "Attente"
 
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: src/inc.c:719
+#: src/inc.c:735
 msgid "Retrieving"
 msgstr "Récupération"
 
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
 #, c-format
 msgid "%d message(s) (%s) received"
 msgstr "%d message(s) (%s) reçu(s)"
 
-#: src/inc.c:732
+#: src/inc.c:748
 #, c-format
 msgid "no new messages"
 msgstr "pas de nouveau message"
 
-#: src/inc.c:733
+#: src/inc.c:749
 msgid "Done"
 msgstr "Terminé"
 
-#: src/inc.c:738
+#: src/inc.c:754
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/inc.c:741
+#: src/inc.c:757
 msgid "Auth failed"
 msgstr "L'authentification a échoué"
 
-#: src/inc.c:745
+#: src/inc.c:761
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: src/inc.c:755
+#: src/inc.c:771
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: src/inc.c:802
+#: src/inc.c:818
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Terminé - %d nouveau(x) message(s)"
 
-#: src/inc.c:805
+#: src/inc.c:821
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "Terminé - pas de nouveau(x) message(s)"
 
-#: src/inc.c:814
+#: src/inc.c:830
 msgid "Some errors occurred while getting mail."
 msgstr "Erreur lors de la récupération des messages."
 
-#: src/inc.c:850
+#: src/inc.c:866
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "Récupération des nouveaux messages du compte %s ...\n"
 
-#: src/inc.c:854
+#: src/inc.c:870
 #, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "%s : Authentification POP3"
 
-#: src/inc.c:857
+#: src/inc.c:873
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Récupération des nouveaux messages"
 
-#: src/inc.c:862
+#: src/inc.c:878
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Connexion au serveur POP3 : %s..."
 
-#: src/inc.c:880
+#: src/inc.c:896
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur POP3 : %s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "Authentification..."
 
-#: src/inc.c:963
+#: src/inc.c:979
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Réception des messages de %s..."
 
-#: src/inc.c:968
+#: src/inc.c:984
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Récupération du nombre de nouveaux messages (STAT)..."
 
-#: src/inc.c:972
+#: src/inc.c:988
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Récupération du nombre de nouveaux messages (LAST)..."
 
-#: src/inc.c:976
+#: src/inc.c:992
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Récupération du nombre de nouveaux messages (UIDL)..."
 
-#: src/inc.c:980
+#: src/inc.c:996
 msgid "Getting the size of messages (LIST)..."
 msgstr "Récupération de la taille des messages (LIST)..."
 
-#: src/inc.c:990
+#: src/inc.c:1006
 #, c-format
 msgid "Deleting message %d"
 msgstr "Suppression du message %d"
 
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
 msgid "Quitting"
 msgstr "Fermeture"
 
-#: src/inc.c:1032
+#: src/inc.c:1048
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3031,15 +3031,15 @@ msgstr ""
 "Erreur dans la gestion des messages indésirables.\n"
 "Vérifier les paramètres."
 
-#: src/inc.c:1375
+#: src/inc.c:1393
 msgid "Connection failed."
 msgstr "La connexion a échoué."
 
-#: src/inc.c:1381
+#: src/inc.c:1399
 msgid "Error occurred while processing mail."
 msgstr "Une erreur est survenue pendant le traitement du message."
 
-#: src/inc.c:1386
+#: src/inc.c:1404
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3048,29 +3048,29 @@ msgstr ""
 "Une erreur est survenue pendant le traitement du message :\n"
 "%s"
 
-#: src/inc.c:1392
+#: src/inc.c:1410
 msgid "No disk space left."
 msgstr "Plus de place disponible sur le disque."
 
-#: src/inc.c:1397
+#: src/inc.c:1415
 msgid "Can't write file."
 msgstr "Impossible d'écrire dans le fichier."
 
-#: src/inc.c:1402
+#: src/inc.c:1420
 msgid "Socket error."
 msgstr "Erreur de protocole."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
 #: src/send_message.c:994
 msgid "Connection closed by the remote host."
 msgstr "La connexion a été fermée par le serveur."
 
-#: src/inc.c:1414
+#: src/inc.c:1432
 msgid "Mailbox is locked."
 msgstr "Boîte verrouillée."
 
-#: src/inc.c:1418
+#: src/inc.c:1436
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3079,11 +3079,11 @@ msgstr ""
 "Boîte verrouillée :\n"
 "%s"
 
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
 msgid "Authentication failed."
 msgstr "L'authentification à échoué."
 
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3092,15 +3092,15 @@ msgstr ""
 "L'authentification a échoué :\n"
 "%s"
 
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
 msgid "Session timed out."
 msgstr "Dépassement du délai de réponse (timeout) de la session."
 
-#: src/inc.c:1475
+#: src/inc.c:1493
 msgid "Incorporation cancelled\n"
 msgstr "Relève du courrier annulée\n"
 
-#: src/inc.c:1584
+#: src/inc.c:1602
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "Récupération des nouveaux messages de %s dans %s...\n"
@@ -3118,16 +3118,16 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:583
+#: src/main.c:598
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:586
+#: src/main.c:601
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:587
+#: src/main.c:602
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3138,24 +3138,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:590
+#: src/main.c:605
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:591
+#: src/main.c:606
 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:592
+#: src/main.c:607
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:593
+#: src/main.c:608
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:594
+#: src/main.c:609
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3163,50 +3163,50 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:596
+#: src/main.c:611
 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:597
+#: src/main.c:612
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dossier    indiquer le dossier contenant les fichiers de "
 "configuration"
 
-#: src/main.c:599
+#: src/main.c:614
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      spécifier le port pour les commandes IPC distantes"
 
-#: src/main.c:601
+#: src/main.c:616
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 quitter Sylpheed"
 
-#: src/main.c:602
+#: src/main.c:617
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:603
+#: src/main.c:618
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:604
+#: src/main.c:619
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:608
+#: src/main.c:623
 #, c-format
 msgid "Press any key..."
 msgstr "Appuyez sur une touche..."
 
-#: src/main.c:743
+#: src/main.c:758
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:744
+#: src/main.c:759
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3230,23 +3230,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:827
+#: src/main.c:842
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:838
+#: src/main.c:853
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:839
+#: src/main.c:854
 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:964
+#: src/main.c:979
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3254,20 +3254,20 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
-#: src/main.c:1197
+#: src/main.c:1212
 msgid "Loading plug-ins..."
 msgstr "Chargement des plug-ins..."
 
 #. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1680
+#: src/main.c:1695
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1681
+#: src/main.c:1696
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3926,7 +3926,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
 #: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -6346,19 +6346,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
 msgid "Date"
 msgstr "Date"
 
@@ -6368,7 +6368,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
 msgid "To"
 msgstr "À"
 
@@ -6775,7 +6775,7 @@ msgstr "À _propos"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - boîte POP3 à distance"
 
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
 msgid "No."
 msgstr "N°"
 
@@ -7716,15 +7716,15 @@ msgstr "Suppression des threads..."
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."