Merge translation files from master branch.

1 files changed, 88 insertions, 6 deletions

diff --git a/tde-i18n-fr/messages/tdepim/kmail.po b/tde-i18n-fr/messages/tdepim/kmail.po
index bc44b26736b..f3c5deb3b35 100644
--- a/tde-i18n-fr/messages/tdepim/kmail.po
+++ b/tde-i18n-fr/messages/tdepim/kmail.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2022-04-06 20:16+0000\n"
+"POT-Creation-Date: 2022-07-19 20:15+0000\n"
 "PO-Revision-Date: 2008-08-15 23:16+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -2434,12 +2434,13 @@ msgstr ""
 "p></qt>"
 
 #: configuredialog.cpp:3767
+#, fuzzy
 msgid ""
 "<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
 "generalization of what is commonly called <b>read receipt</b>. The message "
 "author requests a disposition notification to be sent and the receiver's "
 "mail program generates a reply from which the author can learn what happened "
-"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"to their message. Common disposition types include <b>displayed</b> (i.e. "
 "read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
 "following options are available to control KMail's sending of MDNs:</"
 "p><ul><li><em>Ignore</em>: Ignores any request for disposition "
@@ -2449,7 +2450,7 @@ msgid ""
 "or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
 "<b>denied</b> notification. This is only <em>slightly</em> better than "
 "always sending MDNs. The author will still know that the messages has been "
-"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"acted upon, they just cannot tell whether it was deleted or read etc.</"
 "li><li><em>Always send</em>: Always sends the requested disposition "
 "notification. That means that the author of the message gets to know when "
 "the message was acted upon and, in addition, what happened to it (displayed, "
@@ -7811,15 +7812,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "Générer des alarmes activées et libres / &occupées pour :"
 
 #: kmfolderdia.cpp:539
+#, fuzzy
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
 "tasks in this folder. The setting applies to Calendar and Task folders only "
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
-"Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins"
-"\", since the secretary has no admin rights on the folder.\n"
+"Example use cases: if the boss shares a folder with their secretary, only "
+"the boss should be marked as busy for their meetings, so they should select "
+"\"Admins\", since the secretary has no admin rights on the folder.\n"
 "On the other hand if a working group shares a Calendar for group meetings, "
 "all readers of the folders should be marked as busy for meetings.\n"
 "A company-wide folder with optional events in it would use \"Nobody\" since "
@@ -15210,3 +15212,83 @@ msgstr ""
 
 #~ msgid "Show folder quick search line edit"
 #~ msgstr "Afficher le champ de recherche rapide"
+
+#~ msgid ""
+#~ "<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+#~ "generalization of what is commonly called <b>read receipt</b>. The "
+#~ "message author requests a disposition notification to be sent and the "
+#~ "receiver's mail program generates a reply from which the author can learn "
+#~ "what happened to his message. Common disposition types include "
+#~ "<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. "
+#~ "forwarded).</p><p>The following options are available to control KMail's "
+#~ "sending of MDNs:</p><ul><li><em>Ignore</em>: Ignores any request for "
+#~ "disposition notifications. No MDN will ever be sent automatically "
+#~ "(recommended).</li><li><em>Ask</em>: Answers requests only after asking "
+#~ "the user for permission. This way, you can send MDNs for selected "
+#~ "messages while denying or ignoring them for others.</li><li><em>Deny</"
+#~ "em>: Always sends a <b>denied</b> notification. This is only "
+#~ "<em>slightly</em> better than always sending MDNs. The author will still "
+#~ "know that the messages has been acted upon, he just cannot tell whether "
+#~ "it was deleted or read etc.</li><li><em>Always send</em>: Always sends "
+#~ "the requested disposition notification. That means that the author of the "
+#~ "message gets to know when the message was acted upon and, in addition, "
+#~ "what happened to it (displayed, deleted, etc.). This option is strongly "
+#~ "discouraged, but since it makes much sense e.g. for customer relationship "
+#~ "management, it has been made available.</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>Politique de gestion des accusés de réception</h3><p>Les accusés "
+#~ "de réception sont généralement appelés des <b>notifications de lecture</"
+#~ "b>. L'auteur du message demande un accusé de réception au destinataire. "
+#~ "Celui-ci génère une réponse qu'il renvoie à l'expéditeur pour lui dire "
+#~ "qu'il a lu le message. Les principaux types d'accusés de réception sont "
+#~ "<b>affiché</b> (tel que lorsque le message est lu), <b>supprimé</b> et "
+#~ "<b>diffusé</b> (comme lorsque le message est redirigé).</p><p>Les options "
+#~ "suivantes sont disponibles pour contrôler l'envoi des accusés de "
+#~ "réception dans KMail :</p><ul><li><em>Ignorer</em> : ignore toutes les "
+#~ "demande d'accusés de réception. Aucun accusé ne sera envoyé "
+#~ "automatiquement (option recommandée) ;</li><li><em>Demander</em> : envoie "
+#~ "un accusé de réception seulement après avoir demandé la permission à "
+#~ "l'utilisateur. Ainsi, vous pouvez envoyer des accusés de réception "
+#~ "uniquement pour les messages que vous avez sélectionnés dans un dossier ;"
+#~ "</li><li><em>Refuser</em> : toujours envoyer une notification du type "
+#~ "<b>refusé</b>. Ceci <em>n'est pas</em> le meilleur choix. L'auteur du "
+#~ "message saura que vous avez reçu son courriel, mais ne pourra pas savoir "
+#~ "ce que vous avez exactement fait avec, c'est-à-dire l'avoir lu ou l'avoir "
+#~ "supprimé ;</li><li><em>Toujours envoyer</em> : toujours envoyer un accusé "
+#~ "de réception. Cela permet à l'auteur du message de savoir que vous avez "
+#~ "reçu son courriel, et que vous l'avez lu ou supprimé. Cette option n'est "
+#~ "pas recommandable, mais elle peut avoir un sens lorsque vous travaillez "
+#~ "en relation avec de la clientèle ou des partenaires dans votre travail.</"
+#~ "li></ul></qt>"
+
+#~ msgid ""
+#~ "This setting defines which users sharing this folder should get \"busy\" "
+#~ "periods in their freebusy lists and should see the alarms for the events "
+#~ "or tasks in this folder. The setting applies to Calendar and Task folders "
+#~ "only (for tasks, this setting is only used for alarms).\n"
+#~ "\n"
+#~ "Example use cases: if the boss shares a folder with his secretary, only "
+#~ "the boss should be marked as busy for his meetings, so he should select "
+#~ "\"Admins\", since the secretary has no admin rights on the folder.\n"
+#~ "On the other hand if a working group shares a Calendar for group "
+#~ "meetings, all readers of the folders should be marked as busy for "
+#~ "meetings.\n"
+#~ "A company-wide folder with optional events in it would use \"Nobody\" "
+#~ "since it is not known who will go to those events."
+#~ msgstr ""
+#~ "Ce paramètre définit où les utilisateurs partageant ce dossier devrait "
+#~ "obtenir les périodes « occupé » dans leur listes de « libre / occupé » et "
+#~ "devrait voir les alarmes pour les évènements ou tâches dans ce dossier. "
+#~ "Ce paramètre s'applique pour les dossiers de calendrier et de tâches "
+#~ "uniquement. (pour les tâches, ce paramètre est uniquement utilisé pour "
+#~ "les alarmes).\n"
+#~ "\n"
+#~ "Exemple de cas d'utilisation : si le chef partage un dossier avec sa "
+#~ "secrétaire, seul le chef devrait être marqué comme occupé pour ces rendez-"
+#~ "vous, donc il doit choisir « Administrateurs », alors que sa secrétaire "
+#~ "n'a aucun droit d'administration sur le dossier.\n"
+#~ "D'un autre côté, si un groupe de travail partage un calendrier pour les "
+#~ "rendez-vous du groupe, tous les lecteurs des dossiers devraient être "
+#~ "marqué comme occupé pendant les rendez-vous.\n"
+#~ "Un dossier de société avec des évènements facultatifs devrait utiliser "
+#~ "« Personne » tant que l'on ne sait pas qui viendra à ces évènements."