From: Thérèse Godefroy Date: Fri, 27 Aug 2021 18:13:47 +0000 (+0200) Subject: Merge again. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5781a0a0c1b77e27ccb2115fe45ad83b0c7fed13;p=enc.git Merge again. --- diff --git a/esd-ar.po b/esd-ar.po index 287be485..55f5f44f 100644 --- a/esd-ar.po +++ b/esd-ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2016-02-10 10:12+0100\n" "Last-Translator: Yassir Karroun \n" "Language-Team: \n" @@ -835,7 +835,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-cs.po b/esd-cs.po index fd9df0d6..790b7d8a 100644 --- a/esd-cs.po +++ b/esd-cs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2016-05-04 21:58+0100\n" "Last-Translator: Tomáš Starý \n" "Language-Team: \n" @@ -1280,7 +1280,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-de.po b/esd-de.po index 0b577701..8ce51afe 100644 --- a/esd-de.po +++ b/esd-de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2019-10-31 10:19+0100\n" "Last-Translator: Raffael \n" "Language-Team: \n" @@ -1296,7 +1296,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-el.po b/esd-el.po index a71d7d22..d26c9abd 100644 --- a/esd-el.po +++ b/esd-el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 3.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2014-08-22 01:50+0200\n" "Last-Translator: Ilias Koumoundouros \n" "Language-Team: \n" @@ -1198,7 +1198,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-es.po b/esd-es.po index 5d9cd6f6..01307d5f 100644 --- a/esd-es.po +++ b/esd-es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2021-08-24 19:09+0200\n" "Last-Translator: victorhck \n" "Language-Team: Spanish <>\n" @@ -1033,7 +1033,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-fa.po b/esd-fa.po index 84ad4fe0..94309e42 100644 --- a/esd-fa.po +++ b/esd-fa.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2016-10-07 12:55+0800\n" "Last-Translator: Mohammad Mehdi Habibi \n" "Language-Team: \n" @@ -1260,7 +1260,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-fr.po b/esd-fr.po index b35929a1..8282a785 100644 --- a/esd-fr.po +++ b/esd-fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2021-07-30 22:48+0200\n" "Last-Translator: Thérèse Godefroy\n" "Language-Team: Trad-gnu \n" @@ -791,13 +791,8 @@ msgstr "" "install gnupg. Utilisez cette commande pour installer le programme." #. type: Content of:
-# | [-# Enter gpg --full-generate-key to start the -# | process.-]{+gpg --full-generate-key command not working+} -#, fuzzy -#| msgid "# Enter gpg --full-generate-key to start the process." msgid "gpg --full-generate-key command not working" -msgstr "" -"# Lancez gpg --full-generate-key pour démarrer l'opération." +msgstr "La commande gpg --full-generate-key ne fonctionne pas" #. type: Content of:
msgid "" @@ -805,32 +800,29 @@ msgid "" "code that is something along the lines of: gpg: Invalid option \"--" "full-generate-key\", you can try the following commands:" msgstr "" +"Certaines distributions utilisent une version différente de GPG. Quand vous " +"obtenez un message d'erreur du genre gpg: Option invalide \"--full-" +"generate-key\", vous pouvez essayer les commandes suivantes :" #. type: Content of:
msgid "sudo apt update" -msgstr "" +msgstr "sudo apt update" #. type: Content of:
-# | [-brew-]{+sudo apt+} install [-gnupg-] gnupg2 -#, fuzzy -#| msgid "brew install gnupg gnupg2" msgid "sudo apt install gnupg2" -msgstr "brew install gnupg gnupg2" +msgstr "sudo apt install gnupg2" #. type: Content of:
-# | [-# Enter gpg-]{+gpg2+} --full-generate-key [-to start -# | the process.-] -#, fuzzy -#| msgid "# Enter gpg --full-generate-key to start the process." msgid "gpg2 --full-generate-key" -msgstr "" -"# Lancez gpg --full-generate-key pour démarrer l'opération." +msgstr "gpg --full-generate-key" #. type: Content of:
msgid "" "If this resolved the issue, you need to continue to use the gpg2 identifier " "instead of gpg throughout the following steps of the guide." msgstr "" +"Si cela résout le problème, vous devez continuer à utiliser la commande gpg2 " +"au lieu de gpg dans les étapes suivantes de ce guide." #. type: Content of:
msgid "I took too long to create my passphrase" @@ -1052,7 +1044,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
@@ -1518,22 +1510,6 @@ msgstr "" "Le destinataire est invalide, n'est pas de confiance ou n'a pas été trouvé" #. type: Content of:
-# | You could get the above error message, or something along these lines: -# | \"Unable to send this message with end-to-end encryption, because there -# | are problems with the keys of the following recipients: ...\" In these -# | cases, you may be trying to send an encrypted email to someone when you do -# | not have their public key yet. Make sure you follow the steps above to -# | import the key to your key manager. Open {+the+} OpenPGP Key Manager to -# | make sure the recipient is listed there. -#, fuzzy -#| msgid "" -#| "You could get the above error message, or something along these lines: " -#| "\"Unable to send this message with end-to-end encryption, because there " -#| "are problems with the keys of the following recipients: ...\" In these " -#| "cases, you may be trying to send an encrypted email to someone when you " -#| "do not have their public key yet. Make sure you follow the steps above to " -#| "import the key to your key manager. Open OpenPGP Key Manager to make sure " -#| "the recipient is listed there." msgid "" "You could get the above error message, or something along these lines: " "\"Unable to send this message with end-to-end encryption, because there are " @@ -1581,19 +1557,6 @@ msgid "I can't find Edward's key" msgstr "Je ne trouve pas la clé d'Edward." #. type: Content of:
-# | Close the pop-ups that have appeared since you clicked Send. Make sure you -# | are connected to the Internet and try again. If that doesn't work, -# | [-repeat-] {+you can download+} the [-process, choosing a different -# | keyserver when-] {+key manually from the -# | keyserver, and import+} it [-asks you to pick one.-] {+by using the -# | Import Public Key(s) from File option in the OpenPGP Key Manager.+} -#, fuzzy -#| msgid "" -#| "Close the pop-ups that have appeared since you clicked Send. Make sure " -#| "you are connected to the Internet and try again. If that doesn't work, " -#| "repeat the process, choosing a different keyserver when it asks you to " -#| "pick one." msgid "" "Close the pop-ups that have appeared since you clicked Send. Make sure you " "are connected to the Internet and try again. If that doesn't work, you can " @@ -1603,8 +1566,10 @@ msgid "" msgstr "" "Fermez les fenêtres qui sont apparues quand vous avez cliqué sur Envoyer. " "Assurez-vous que vous êtes connecté à Internet et réessayez. Si cela ne " -"marche pas, répétez le processus en choisissant un serveur de clés différent " -"quand il vous demande d'en choisir un." +"marche pas, vous pouvez télécharger la clé manuellement depuis le serveur de " +"clés et l'importer en utilisant l'option Importer une ou des clés " +"publiques depuis un fichier." #. type: Content of:
msgid "Unscrambled messages in the Sent folder" diff --git a/esd-gl.po b/esd-gl.po index 52f2b47f..1db779b6 100644 --- a/esd-gl.po +++ b/esd-gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2021-08-18 12:48+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1017,7 +1017,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-it.po b/esd-it.po index 466f4e44..9285646e 100644 --- a/esd-it.po +++ b/esd-it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense.fsf.org 3.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2014-09-28 18:57+0200\n" "Last-Translator: quietwalker \n" "Language-Team: \n" @@ -1189,7 +1189,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-ja.po b/esd-ja.po index a4e95a78..4b71144a 100644 --- a/esd-ja.po +++ b/esd-ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2016-02-29 23:39+0000\n" "Last-Translator: NIIBE Yutaka \n" "Language-Team: Japanese \n" @@ -1271,7 +1271,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-ko.po b/esd-ko.po index c9ebef9e..dedac16e 100644 --- a/esd-ko.po +++ b/esd-ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2014-06-26 08:45+0000\n" "Last-Translator: Yongmin Hong \n" "Language-Team: \n" @@ -1130,7 +1130,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-ml.po b/esd-ml.po index 0c25986d..74fc4de3 100644 --- a/esd-ml.po +++ b/esd-ml.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2014-07-03 17:00:00+0200\n" "Last-Translator: Jsx \n" "Language-Team: \n" @@ -1029,7 +1029,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-pt-br.po b/esd-pt-br.po index 129e464b..84f36bf3 100644 --- a/esd-pt-br.po +++ b/esd-pt-br.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1193,7 +1193,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-ro.po b/esd-ro.po index 59e27bb9..5045c6d7 100644 --- a/esd-ro.po +++ b/esd-ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1202,7 +1202,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-sq.po b/esd-sq.po index ee63f976..7abf68b4 100644 --- a/esd-sq.po +++ b/esd-sq.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2016-11-21 21:38+0200\n" "Last-Translator: Besnik Bleta \n" "Language-Team: besnik@programeshqip.org\n" @@ -1276,7 +1276,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-temp.pot b/esd-temp.pot index ee5c6757..4684da26 100644 --- a/esd-temp.pot +++ b/esd-temp.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-08-27 19:46+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -767,7 +767,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-tr.po b/esd-tr.po index 6513d101..34c2b06d 100644 --- a/esd-tr.po +++ b/esd-tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2021-08-13 20:33+0200\n" "Last-Translator: T. E. Kalayci \n" "Language-Team: \n" @@ -1015,7 +1015,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-ua.po b/esd-ua.po index fa745e0c..b1a5531b 100644 --- a/esd-ua.po +++ b/esd-ua.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:46+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2021-01-18 20:20+0200\n" "Last-Translator: Andrew V. Isakov \n" "Language-Team: \n" @@ -1008,7 +1008,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of:
diff --git a/esd-zh-hans.po b/esd-zh-hans.po index f4cf0eab..089447c8 100644 --- a/esd-zh-hans.po +++ b/esd-zh-hans.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" -"POT-Creation-Date: 2021-08-27 19:37+0200\n" +"POT-Creation-Date: 2021-08-27 20:11+0200\n" "PO-Revision-Date: 2020-05-20 15:02+0800\n" "Last-Translator: Tom \n" "Language-Team: \n" @@ -1215,7 +1215,7 @@ msgstr "" msgid "" "Instead of using the general command to upload your key to the keyserver, " "you can use a more specific command and add the keyserver to your command " -"gpg --keyserver keys.openpgp.org --send-key [key id]." +"gpg --keyserver keys.openpgp.org --send-key [key id]." msgstr "" #. type: Content of: