[git] GpgOL - branch, master, updated. gpgol-2.0.6-77-g808be5a
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Mar 7 08:24:47 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via 808be5a08d8a6f46f9e6eff82e23797ae9ec5343 (commit)
via 4040b97d6d4177ed64765c5666175b09f780a1bd (commit)
from b4c25ecda4b02f1c3dda9ce424ce21aa5471509e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 808be5a08d8a6f46f9e6eff82e23797ae9ec5343
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 7 08:24:31 2018 +0100
Auto update translations
* po/: update.
diff --git a/po/de.po b/po/de.po
index c0f8061..d516fd5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
-"PO-Revision-Date: 2018-03-05 14:43+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"PO-Revision-Date: 2018-03-07 08:24+0100\n"
"Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
"Language-Team: English <kde-i18n-de at kde.org>\n"
"Language: en_US\n"
@@ -46,7 +46,7 @@ msgstr "Neue Nachrichten per Voreinstellung signieren"
#: src/addin-options.cpp:46
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
-msgstr "&OpenPGP-Nachrichten ohne Anhänge als PGP/Inline verschlüsseln"
+msgstr "&OpenPGP-Nachrichten ohne Anhänge als PGP/Inline senden"
#: src/addin-options.cpp:48
msgid "S&elect crypto settings automatically for reply and forward"
@@ -175,11 +175,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Möchten Sie diesen Ordner von GpgOL befreien?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
@@ -425,11 +425,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr "Öschl Verzeichnis Bestätigung"
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -443,19 +443,19 @@ msgstr ""
"<p>Wenn sie dies nicht angefordert haben, können Sie diese Mail ignorieren.</"
"p>\n"
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr "Bitte warten Sie während die Nachricht entschlüsselt / geprüft wird..."
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -468,7 +468,7 @@ msgstr ""
"\n"
"Details siehe: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -481,7 +481,7 @@ msgstr ""
"\n"
"Details siehe: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -498,93 +498,93 @@ msgstr ""
"\n"
"Möchten Sie die Nachricht nur verschlüsseln?"
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
"Sie können nicht sicher sein wer die Nachricht gesendet, modifiziert oder "
"während der Übertragung gelesen hat."
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr "Die Nachricht ist signiert aber die überprüfung schlug fehl mit:"
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
"Aber Sie können nicht sicher sein wer der Absender der Nachricht ist da "
"diese nicht signiert wurde. "
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr "Der Absender ist berechtigt für Sie Identitäten zu beglaubigen."
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
"Die Identität des Absenders wurde von mehreren vertrauenswürdigen Personen "
"beglaubigt."
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -593,12 +593,12 @@ msgstr ""
"Die Idenität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -610,11 +610,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -624,70 +624,70 @@ msgstr ""
"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
"haben. Seit dem %s."
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
"ist nicht der gleiche Schlüssel der in der vergangenheit für diese Adresse "
"verwendet wurde."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -695,59 +695,59 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr "Klicken Sie hier um den Schlüssel für diese Adresse zu ändern."
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr ""
"Klicken Sie hier um den Schlüssel auf dem konfigurierten Schlüsselserver zu "
"suchen. "
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
"Schlüsselserver zu suchen."
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Verschlüsselung nicht möglich!"
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
diff --git a/po/fr.po b/po/fr.po
index af6d6fa..3e9939d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
"PO-Revision-Date: 2015-10-01 17:05+0200\n"
"Last-Translator: Olivier Serve <olivier.serve at atos.net>\n"
"Language-Team: French <kde-i18n-doc at kde.org>\n"
@@ -172,12 +172,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Voulez-vous récupérer ce dossier ?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -409,11 +409,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -422,20 +422,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -443,7 +443,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -451,7 +451,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -461,105 +461,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -567,142 +567,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
"messages and encrypted %i messages to it since %s."
msgstr ""
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
diff --git a/po/pt.po b/po/pt.po
index 258fa6b..5bfe6fd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
"PO-Revision-Date: 2017-10-16 14:17+0100\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -175,11 +175,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
@@ -425,11 +425,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -438,21 +438,21 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
msgid "Encrypted message"
msgstr "Mensagem encriptada"
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
"Por favor aguarda enquanto a mensagem está a ser desencriptada / "
"verificada..."
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -460,7 +460,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -468,7 +468,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -478,91 +478,91 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
"Não podes ter a certeza de quem enviou, modificou e leu a mensagem em "
"trânsito."
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
"Não podes ter certeza de quem enviou a mensagem, porque não está assinada."
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
"A identidade dos remetentes foi certificada por várias pessoas confiáveis."
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -571,11 +571,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -586,11 +586,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -599,68 +599,68 @@ msgstr ""
"O endereço dos remetentes ainda não é confiável porque apenas verificaste %i "
"mensagens e encriptaste %i mensagens a eles desde %s."
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr "não é o mesmo que a chave usada para este endereço no passado."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -668,58 +668,58 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr "Clica aqui para alterar a chave usada para este endereço."
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr "Clica aqui para localizar a chave no servidor de chaves configurado."
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Clica aqui para localizar o certificado no servidor de chaves X509 "
"configurado."
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
diff --git a/po/sv.po b/po/sv.po
index 9f99ae6..b5c5ad4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -164,12 +164,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -398,11 +398,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -411,20 +411,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -432,7 +432,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -440,7 +440,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -450,105 +450,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -556,142 +556,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
"messages and encrypted %i messages to it since %s."
msgstr ""
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4daba20..bf3b05b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -168,12 +168,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤销这个文件夹吗？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -397,11 +397,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -410,20 +410,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -431,7 +431,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -439,7 +439,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -449,105 +449,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -555,142 +555,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
"messages and encrypted %i messages to it since %s."
msgstr ""
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密消息"
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ea7e1a7..8b9f530 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-05 14:35+0100\n"
+"POT-Creation-Date: 2018-03-06 15:25+0100\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -168,12 +168,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤銷這個資料夾嗎？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1743 src/mail.cpp:1814
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1744 src/mail.cpp:1815
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -397,11 +397,11 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:804
+#: src/mail.cpp:811
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:805
+#: src/mail.cpp:812
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -410,20 +410,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:813 src/mail.cpp:2058
+#: src/mail.cpp:820 src/mail.cpp:2006
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:814
+#: src/mail.cpp:821
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1088
+#: src/mail.cpp:1095
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1092
+#: src/mail.cpp:1099
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -431,7 +431,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1107
+#: src/mail.cpp:1114
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -439,7 +439,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1122
+#: src/mail.cpp:1129
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -449,105 +449,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:2003
+#: src/mail.cpp:1951
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2007
+#: src/mail.cpp:1955
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2011
+#: src/mail.cpp:1959
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2015
+#: src/mail.cpp:1963
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2019
+#: src/mail.cpp:1967
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1971
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2027
+#: src/mail.cpp:1975
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:2036 src/mail.cpp:2038 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2050
+#: src/mail.cpp:1998
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:2054
+#: src/mail.cpp:2002
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:2061 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:2072 src/mail.cpp:2083
+#: src/mail.cpp:2020 src/mail.cpp:2031
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2075
+#: src/mail.cpp:2023
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2041
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2097
+#: src/mail.cpp:2045
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2101
+#: src/mail.cpp:2049
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2072
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:2128
+#: src/mail.cpp:2076
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2080
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2145
+#: src/mail.cpp:2093
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2150
+#: src/mail.cpp:2098
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2158
+#: src/mail.cpp:2106
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2168
+#: src/mail.cpp:2116
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -555,142 +555,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2184
+#: src/mail.cpp:2132
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2139
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
"messages and encrypted %i messages to it since %s."
msgstr ""
-#: src/mail.cpp:2205
+#: src/mail.cpp:2153
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2154
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2162
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2219
+#: src/mail.cpp:2167
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2223
+#: src/mail.cpp:2171
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2175
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:2235
+#: src/mail.cpp:2183
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:2239
+#: src/mail.cpp:2187
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2243
+#: src/mail.cpp:2191
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2247
+#: src/mail.cpp:2195
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2251 src/mail.cpp:2255
+#: src/mail.cpp:2199 src/mail.cpp:2203
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2260
+#: src/mail.cpp:2208
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2214
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2279
+#: src/mail.cpp:2227
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2283
+#: src/mail.cpp:2231
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2288
+#: src/mail.cpp:2236
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2292
+#: src/mail.cpp:2240
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2302
+#: src/mail.cpp:2250
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2306
+#: src/mail.cpp:2254
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2314
+#: src/mail.cpp:2262
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2318
+#: src/mail.cpp:2266
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2329
+#: src/mail.cpp:2277
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2333
+#: src/mail.cpp:2281
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2334
+#: src/mail.cpp:2282
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2338
+#: src/mail.cpp:2286
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2339
+#: src/mail.cpp:2287
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2567
+#: src/mail.cpp:2515
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密訊息"
-#: src/mail.cpp:2569
+#: src/mail.cpp:2517
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
commit 4040b97d6d4177ed64765c5666175b09f780a1bd
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 7 08:21:36 2018 +0100
Allow Inline for signed & encrypted with GSuite
* src/mail.cpp (Mail::encrypt_sign_start): Relax GSuite checks.
--
We now support clearsigned and signed & encrypted inline mails
thanks to the new crypto architecture.
GnuPG-Bug-Id: T3545
diff --git a/src/mail.cpp b/src/mail.cpp
index db27ee6..aba08d3 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1091,10 +1091,10 @@ Mail::encrypt_sign_start ()
mapi_release_attach_table (att_table);
/* Check for attachments if we have some abort. */
- wchar_t *w_title = utf8_to_wchar (_(
- "GpgOL: Oops, G Suite Sync account detected"));
if (n_att_usable)
{
+ wchar_t *w_title = utf8_to_wchar (_(
+ "GpgOL: Oops, G Suite Sync account detected"));
wchar_t *msg = utf8_to_wchar (
_("G Suite Sync breaks outgoing crypto mails "
"with attachments.\nUsing crypto and attachments "
@@ -1108,45 +1108,6 @@ Mail::encrypt_sign_start ()
xfree (w_title);
return -1;
}
- if (flags == 2)
- {
- wchar_t *msg = utf8_to_wchar (
- _("G Suite Sync breaks outgoing signed mails.\n"
- "Ensuring mail integrity (signing) with G Suite Sync "
- "is not supported.\n\n"
- "See: https://dev.gnupg.org/T3545 for details."));
- MessageBoxW (window,
- msg,
- w_title,
- MB_ICONINFORMATION|MB_OK);
- xfree (msg);
- xfree (w_title);
- return -1;
- }
- if (flags == 3)
- {
- wchar_t *msg = utf8_to_wchar (
- _("G Suite Sync breaks outgoing signed mails.\n"
- "Ensuring mail integrity (signing) with G Suite Sync "
- "is not supported.\n\n"
- "See: https://dev.gnupg.org/T3545 for details.\n\n"
- "Do you want to only encrypt the message?"));
- if(MessageBoxW (window,
- msg,
- w_title,
- MB_ICONINFORMATION|MB_YESNO) != IDYES)
- {
- xfree (msg);
- xfree (w_title);
- return -1;
- }
- else
- {
- flags = 1;
- }
- xfree (msg);
- }
- xfree (w_title);
}
m_do_inline = m_is_gsuite ? true : opt.inline_pgp;
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 134 +++++++++++++++++++++++++++++------------------------------
po/fr.po | 130 ++++++++++++++++++++++++++++-----------------------------
po/pt.po | 130 ++++++++++++++++++++++++++++-----------------------------
po/sv.po | 130 ++++++++++++++++++++++++++++-----------------------------
po/zh_CN.po | 130 ++++++++++++++++++++++++++++-----------------------------
po/zh_TW.po | 130 ++++++++++++++++++++++++++++-----------------------------
src/mail.cpp | 43 +------------------
7 files changed, 394 insertions(+), 433 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list