[git] GpgOL - branch, master, updated. gpgol-2.0.2-10-gf9f9e76
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Nov 20 09:11:00 CET 2017
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 f9f9e76070be8ee1958eb6d08c8ee4ee93115b4a (commit)
via f79e157cd3e6dc6a4f7a232f5f2867cd4644cffc (commit)
via 8ec22330f956b2854cbeae2d710c761cf6de3d9d (commit)
via 4351cc3cb5c6345bf369e73c35f6796b22d10987 (commit)
from 278893850ed926d4646929ee97576a8d09fd4998 (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 f9f9e76070be8ee1958eb6d08c8ee4ee93115b4a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 09:10:32 2017 +0100
Update NEWS for todays release
--
diff --git a/NEWS b/NEWS
index b677980..2e4bf7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,13 @@
-Noteworthy changes for version 2.0.3 (unreleased)
+Noteworthy changes for version 2.0.3 (2017-11-20)
=================================================
+ * Additional saveguards have been added to prevent
+ sending out unencrypted bodys when used with
+ Exchange 2007.
+
+ * Fixed a regression from 2.0.2 regarding message
+ list display in Outlook 2010 and 2013.
+
Noteworthy changes for version 2.0.2 (2017-11-16)
=================================================
commit f79e157cd3e6dc6a4f7a232f5f2867cd4644cffc
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 09:10:16 2017 +0100
Auto update PO files
--
diff --git a/po/de.po b/po/de.po
index b95e878..028116a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+0100\n"
"PO-Revision-Date: 2017-07-27 09:18+0100\n"
"Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
"Language-Team: English <kde-i18n-de at kde.org>\n"
@@ -86,7 +86,7 @@ msgstr "Die Benutzeroberfläche zu ändern erfordert einen Neustart von Outlook"
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr "GpgOL"
@@ -174,11 +174,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:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
@@ -424,7 +424,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
@@ -432,89 +432,89 @@ msgstr "Verschlüsselte Nachricht"
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:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
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:1790
+#: src/mail.cpp:1783
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
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:1821
+#: src/mail.cpp:1814
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
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:1842
+#: src/mail.cpp:1835
msgid "The senders identity was certified by several trusted people."
msgstr ""
"The Identität des Absenders wurde von mehreren vertrauenswürdigen Personen "
"beglaubigt."
-#: src/mail.cpp:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -523,12 +523,12 @@ msgstr ""
"Die Idenität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -540,11 +540,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -554,70 +554,70 @@ msgstr ""
"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
"haben. Seit dem %s."
-#: src/mail.cpp:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
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:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -625,49 +625,49 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
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:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
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:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
@@ -710,6 +710,21 @@ msgstr ""
"Beispielsweise durch einen Rechtsklick auf die Nachricht wenn diese nicht "
"ausgewählt ist.\n"
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "GpgOL: Verschlüsselte Nachricht"
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -819,7 +834,7 @@ msgstr "Signaturerstellungsfehler (%s)"
msgid "Error writing to stream"
msgstr "Dateischreibfehler"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "Ein-/Ausgabefehler"
@@ -984,34 +999,6 @@ msgstr ""
"GnuPG konnte nicht gefunden werden. Bitte stellen sie sicher das Gpg4win "
"korrekt installiert ist."
-#: src/pgpmime.c:358
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr ""
-"Fehler beim erstellen der Datei\n"
-"Bitte eine andere Datei auswählen"
-
-#: src/pgpmime.c:510
-msgid "Error writing file"
-msgstr "Fehler beim schreiben der Datei"
-
-#: src/pgpmime.c:586
-msgid "[PGP/MIME message]"
-msgstr "[PGP/MIME Nachricht]"
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr "[PGP/MIME Nachricht ohne reinen Textkörper]"
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr "[PGP/MIME signierte Nachricht ohne reinen Textkörper]"
-
-#: src/pgpmime.c:694
-msgid "[PGP/MIME signature]"
-msgstr "[PGP/MIME Signatur]"
-
#: src/ribbon-callbacks.cpp:262
msgid "Please select text to encrypt."
msgstr "Bitte selektieren Sie den zu verschlüsselnden Text."
@@ -1048,11 +1035,11 @@ msgstr "Signierter Text"
msgid "Select file to encrypt"
msgstr "Auswählen der zu verschlüsselnden Datei"
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
msgid "No message selected"
msgstr "Keine Nachricht ausgewählt"
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -1063,7 +1050,7 @@ msgstr ""
"Es gibt keine zusätzliche Information darüber ob sie wirklich von '%s' "
"gesendet wurde oder ob jemand die Absenderadresse vortäuscht."
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
@@ -1072,6 +1059,28 @@ msgstr ""
"erneut mit der Komponente Kleopatra aktiviert."
#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr ""
+#~ "Fehler beim erstellen der Datei\n"
+#~ "Bitte eine andere Datei auswählen"
+
+#~ msgid "Error writing file"
+#~ msgstr "Fehler beim schreiben der Datei"
+
+#~ msgid "[PGP/MIME message]"
+#~ msgstr "[PGP/MIME Nachricht]"
+
+#~ msgid "[PGP/MIME message without plain text body]"
+#~ msgstr "[PGP/MIME Nachricht ohne reinen Textkörper]"
+
+#~ msgid "[PGP/MIME signed message without a plain text body]"
+#~ msgstr "[PGP/MIME signierte Nachricht ohne reinen Textkörper]"
+
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "[PGP/MIME Signatur]"
+
+#~ msgid ""
#~ "You cannot be sure who sent, modified and read the message in transit.\n"
#~ "\n"
#~ "Click here to learn more."
diff --git a/po/fr.po b/po/fr.po
index 1b93399..522e939 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: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+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"
@@ -84,7 +84,7 @@ msgstr ""
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr "GpgOL"
@@ -171,12 +171,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:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -408,7 +408,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
@@ -417,101 +417,101 @@ msgstr "Déchiffrer le message"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1790
+#: src/mail.cpp:1783
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1821
+#: src/mail.cpp:1814
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1842
+#: src/mail.cpp:1835
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -519,133 +519,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, 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:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -675,6 +675,21 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "Déchiffrer le message"
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -780,7 +795,7 @@ msgstr "Échec de la signature (%s)"
msgid "Error writing to stream"
msgstr "Erreur d'écriture dans le flux"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "Erreur d'entrée/sortie"
@@ -915,35 +930,6 @@ msgid ""
"installed."
msgstr ""
-#: src/pgpmime.c:358
-#, fuzzy
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr "Erreur à la création du fichier à joindre."
-
-#: src/pgpmime.c:510
-#, fuzzy
-msgid "Error writing file"
-msgstr "Erreur d'écriture dans le flux"
-
-#: src/pgpmime.c:586
-msgid "[PGP/MIME message]"
-msgstr ""
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:694
-#, fuzzy
-msgid "[PGP/MIME signature]"
-msgstr "Signature valide"
-
#: src/ribbon-callbacks.cpp:262
msgid "Please select text to encrypt."
msgstr "Veuillez sélectionner le texte à chiffrer."
@@ -980,12 +966,12 @@ msgstr "Texte signé"
msgid "Select file to encrypt"
msgstr "Sélectionner le fichier à chiffrer"
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
#, fuzzy
msgid "No message selected"
msgstr "Ce message n'est pas chiffré"
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -993,13 +979,27 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr "Erreur à la création du fichier à joindre."
+
+#, fuzzy
+#~ msgid "Error writing file"
+#~ msgstr "Erreur d'écriture dans le flux"
+
+#, fuzzy
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "Signature valide"
+
+#, fuzzy
#~ msgid "This message is not signed.\n"
#~ msgstr "Ce message n'est pas chiffré"
diff --git a/po/pt.po b/po/pt.po
index 030bfe0..273a387 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: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+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"
@@ -87,7 +87,7 @@ msgstr "Mudar a interface necessita reiniciar o Outlook."
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr "GpgOL"
@@ -174,11 +174,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
@@ -424,7 +424,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
msgid "Encrypted message"
msgstr "Mensagem encriptada"
@@ -434,87 +434,87 @@ msgstr ""
"Por favor aguarda enquanto a mensagem está a ser desencriptada / "
"verificada..."
-#: src/mail.cpp:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
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:1790
+#: src/mail.cpp:1783
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
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:1821
+#: src/mail.cpp:1814
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:1842
+#: src/mail.cpp:1835
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:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -523,11 +523,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -538,11 +538,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -551,68 +551,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:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
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:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -620,47 +620,47 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
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:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
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:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Clica aqui para localizar o certificado no servidor de chaves X509 "
@@ -702,6 +702,21 @@ msgstr ""
"Por exemplo, ao clicar com o botão direito do rato, mas não selecionar a "
"mensagem.\n"
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "GpgOL: Mensagem Encriptada"
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -807,7 +822,7 @@ msgstr "A assinatura falhou (%s)"
msgid "Error writing to stream"
msgstr "Erro ao escrever no stream"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "I/O-Erro"
@@ -965,34 +980,6 @@ msgstr ""
"Falha ao localizar o GnuPG, por favor certifica-te que o GnuPG ou o Gpg4win "
"está corretamente instalado."
-#: src/pgpmime.c:358
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr ""
-"Erro ao criar ficheiro\n"
-"Por favor seleciona outro"
-
-#: src/pgpmime.c:510
-msgid "Error writing file"
-msgstr "Erro ao escrever o ficheiro"
-
-#: src/pgpmime.c:586
-msgid "[PGP/MIME message]"
-msgstr "[Mensagem PGP/MIME]"
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr "[Mensagem PGP/MIME sem corpo de texto simples]"
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr "[Mensagem PGP/MIME assinada sem corpo de texto simples]"
-
-#: src/pgpmime.c:694
-msgid "[PGP/MIME signature]"
-msgstr "[Assinatura PGP/MIME]"
-
#: src/ribbon-callbacks.cpp:262
msgid "Please select text to encrypt."
msgstr "Por favor seleciona o texto a encriptar."
@@ -1029,11 +1016,11 @@ msgstr "Texto assinado"
msgid "Select file to encrypt"
msgstr "Seleciona o ficheiro a encriptar"
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
msgid "No message selected"
msgstr "Nenhuma mensagem selecionada"
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -1044,7 +1031,7 @@ msgstr ""
"Não há nenhuma informação adicional disponível se ela realmente foi enviada "
"por '%s' ou se alguém falsificou o endereço do remetente."
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
@@ -1053,6 +1040,28 @@ msgstr ""
"Por favor reinstala o Gpg4win com o componente Kleopatra ativado."
#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr ""
+#~ "Erro ao criar ficheiro\n"
+#~ "Por favor seleciona outro"
+
+#~ msgid "Error writing file"
+#~ msgstr "Erro ao escrever o ficheiro"
+
+#~ msgid "[PGP/MIME message]"
+#~ msgstr "[Mensagem PGP/MIME]"
+
+#~ msgid "[PGP/MIME message without plain text body]"
+#~ msgstr "[Mensagem PGP/MIME sem corpo de texto simples]"
+
+#~ msgid "[PGP/MIME signed message without a plain text body]"
+#~ msgstr "[Mensagem PGP/MIME assinada sem corpo de texto simples]"
+
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "[Assinatura PGP/MIME]"
+
+#~ msgid ""
#~ "You cannot be sure who sent, modified and read the message in transit.\n"
#~ "\n"
#~ "Click here to learn more."
diff --git a/po/sv.po b/po/sv.po
index b97cbb8..9638b8a 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: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+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"
@@ -84,7 +84,7 @@ msgstr ""
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr ""
@@ -163,12 +163,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
@@ -406,101 +406,101 @@ msgstr "Dekryptera och validera meddelandet."
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1790
+#: src/mail.cpp:1783
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1821
+#: src/mail.cpp:1814
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1842
+#: src/mail.cpp:1835
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -508,133 +508,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, 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:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -665,6 +665,21 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -757,7 +772,7 @@ msgstr "Signering misslyckades"
msgid "Error writing to stream"
msgstr "Fel vid skrivning av fil"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "In-/Ut-fel"
@@ -870,37 +885,6 @@ msgid ""
"installed."
msgstr ""
-#: src/pgpmime.c:358
-#, fuzzy
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr ""
-"Fel vid skapande av fil\n"
-"Välj en annan"
-
-#: src/pgpmime.c:510
-#, fuzzy
-msgid "Error writing file"
-msgstr "Fel vid skrivning av fil"
-
-#: src/pgpmime.c:586
-#, fuzzy
-msgid "[PGP/MIME message]"
-msgstr "[PGP/MIME-signatur]"
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr "[PGP/MIME-meddelande utan vanlig meddelandetext]"
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr "[PGP/MIME-signerat meddelande utan vanlig meddelandetext]"
-
-#: src/pgpmime.c:694
-msgid "[PGP/MIME signature]"
-msgstr "[PGP/MIME-signatur]"
-
#: src/ribbon-callbacks.cpp:262
#, fuzzy
msgid "Please select text to encrypt."
@@ -942,11 +926,11 @@ msgstr ""
msgid "Select file to encrypt"
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
msgid "No message selected"
msgstr ""
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -954,13 +938,38 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr ""
+#~ "Fel vid skapande av fil\n"
+#~ "Välj en annan"
+
+#, fuzzy
+#~ msgid "Error writing file"
+#~ msgstr "Fel vid skrivning av fil"
+
+#, fuzzy
+#~ msgid "[PGP/MIME message]"
+#~ msgstr "[PGP/MIME-signatur]"
+
+#~ msgid "[PGP/MIME message without plain text body]"
+#~ msgstr "[PGP/MIME-meddelande utan vanlig meddelandetext]"
+
+#~ msgid "[PGP/MIME signed message without a plain text body]"
+#~ msgstr "[PGP/MIME-signerat meddelande utan vanlig meddelandetext]"
+
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "[PGP/MIME-signatur]"
+
+#, fuzzy
#~ msgid "This message is not signed.\n"
#~ msgstr "Dekryptera meddelandet och validera signaturen"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 66fa31d..4da861e 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: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+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"
@@ -85,7 +85,7 @@ msgstr ""
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr "GpgOL"
@@ -167,12 +167,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤销这个文件夹吗？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
@@ -405,101 +405,101 @@ msgstr "解密消息"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1790
+#: src/mail.cpp:1783
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1821
+#: src/mail.cpp:1814
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1842
+#: src/mail.cpp:1835
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -507,133 +507,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, 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:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -663,6 +663,21 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "解密消息"
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -761,7 +776,7 @@ msgstr "签名失败 (%s)"
msgid "Error writing to stream"
msgstr "写入流时出错。"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "输入输出错误"
@@ -900,35 +915,6 @@ msgid ""
"installed."
msgstr ""
-#: src/pgpmime.c:358
-#, fuzzy
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr "生成附件时出错。"
-
-#: src/pgpmime.c:510
-#, fuzzy
-msgid "Error writing file"
-msgstr "写入流时出错。"
-
-#: src/pgpmime.c:586
-msgid "[PGP/MIME message]"
-msgstr ""
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:694
-#, fuzzy
-msgid "[PGP/MIME signature]"
-msgstr "完好的签名"
-
#: src/ribbon-callbacks.cpp:262
msgid "Please select text to encrypt."
msgstr "选择要加密的文字。"
@@ -965,12 +951,12 @@ msgstr "签名过的文本"
msgid "Select file to encrypt"
msgstr "选择要加密的文件"
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
#, fuzzy
msgid "No message selected"
msgstr "此消息未被加密。"
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -978,13 +964,27 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr "生成附件时出错。"
+
+#, fuzzy
+#~ msgid "Error writing file"
+#~ msgstr "写入流时出错。"
+
+#, fuzzy
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "完好的签名"
+
+#, fuzzy
#~ msgid "This message is not signed.\n"
#~ msgstr "此消息未被加密。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a7f17c5..f153b3a 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: 2017-11-16 10:00+0100\n"
+"POT-Creation-Date: 2017-11-20 09:10+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"
@@ -85,7 +85,7 @@ msgstr ""
#: src/ribbon-callbacks.cpp:736 src/ribbon-callbacks.cpp:796
#: src/ribbon-callbacks.cpp:1078 src/ribbon-callbacks.cpp:1112
#: src/ribbon-callbacks.cpp:1124 src/ribbon-callbacks.cpp:1149
-#: src/ribbon-callbacks.cpp:1644 src/ribbon-callbacks.cpp:1694
+#: src/ribbon-callbacks.cpp:1668 src/ribbon-callbacks.cpp:1718
msgid "GpgOL"
msgstr "GpgOL"
@@ -167,12 +167,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤銷這個資料夾嗎？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1453 src/mail.cpp:1524
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1454 src/mail.cpp:1525
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1768
+#: src/mail.cpp:710 src/mail.cpp:1761
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
@@ -405,101 +405,101 @@ msgstr "解密訊息"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1713
+#: src/mail.cpp:1706
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1717
+#: src/mail.cpp:1710
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1721
+#: src/mail.cpp:1714
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1725
+#: src/mail.cpp:1718
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1729
+#: src/mail.cpp:1722
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1733
+#: src/mail.cpp:1726
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1737
+#: src/mail.cpp:1730
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1746 src/mail.cpp:1748 src/ribbon-callbacks.cpp:1557
+#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1760
+#: src/mail.cpp:1753
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:1764
+#: src/mail.cpp:1757
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:1771 src/ribbon-callbacks.cpp:1580
+#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:1781
+#: src/mail.cpp:1774
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1790
+#: src/mail.cpp:1783
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1794
+#: src/mail.cpp:1787
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1798
+#: src/mail.cpp:1791
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1821
+#: src/mail.cpp:1814
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:1825
+#: src/mail.cpp:1818
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1829
+#: src/mail.cpp:1822
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1842
+#: src/mail.cpp:1835
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1847
+#: src/mail.cpp:1840
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1855
+#: src/mail.cpp:1848
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1865
+#: src/mail.cpp:1858
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -507,133 +507,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:1874
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1888
+#: src/mail.cpp:1881
#, 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:1902
+#: src/mail.cpp:1895
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1903
+#: src/mail.cpp:1896
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1911
+#: src/mail.cpp:1904
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:1916
+#: src/mail.cpp:1909
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1920
+#: src/mail.cpp:1913
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1924
+#: src/mail.cpp:1917
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:1932
+#: src/mail.cpp:1925
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:1936
+#: src/mail.cpp:1929
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1940
+#: src/mail.cpp:1933
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1944
+#: src/mail.cpp:1937
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1948 src/mail.cpp:1952
+#: src/mail.cpp:1941 src/mail.cpp:1945
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1950
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1956
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1976
+#: src/mail.cpp:1969
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1980
+#: src/mail.cpp:1973
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1985
+#: src/mail.cpp:1978
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1989
+#: src/mail.cpp:1982
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1999
+#: src/mail.cpp:1992
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2003
+#: src/mail.cpp:1996
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2011
+#: src/mail.cpp:2004
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2015
+#: src/mail.cpp:2008
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2026
+#: src/mail.cpp:2019
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2030
+#: src/mail.cpp:2023
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2031
+#: src/mail.cpp:2024
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2028
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2036
+#: src/mail.cpp:2029
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -663,6 +663,21 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:393
+#, fuzzy
+msgid "GpgOL: Encryption not possible!"
+msgstr "解密訊息"
+
+#: src/mailitem-events.cpp:395
+msgid ""
+"Outlook returned an error when trying to send the encrypted mail.\n"
+"\n"
+"Please restart Outlook and try again.\n"
+"\n"
+"If it still fails consider using an encrypted attachment or\n"
+"switching to PGP/Inline in GpgOL's options."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
@@ -761,7 +776,7 @@ msgstr "簽名失敗 (%s)"
msgid "Error writing to stream"
msgstr "寫入流時出錯。"
-#: src/mimeparser.c:1214 src/pgpmime.c:360 src/pgpmime.c:511
+#: src/mimeparser.c:1214
msgid "I/O-Error"
msgstr "輸入輸出錯誤"
@@ -902,35 +917,6 @@ msgid ""
"installed."
msgstr ""
-#: src/pgpmime.c:358
-#, fuzzy
-msgid ""
-"Error creating file\n"
-"Please select another one"
-msgstr "生成附件時出錯。"
-
-#: src/pgpmime.c:510
-#, fuzzy
-msgid "Error writing file"
-msgstr "寫入流時出錯。"
-
-#: src/pgpmime.c:586
-msgid "[PGP/MIME message]"
-msgstr ""
-
-#: src/pgpmime.c:607
-msgid "[PGP/MIME message without plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:682
-msgid "[PGP/MIME signed message without a plain text body]"
-msgstr ""
-
-#: src/pgpmime.c:694
-#, fuzzy
-msgid "[PGP/MIME signature]"
-msgstr "完好的簽名"
-
#: src/ribbon-callbacks.cpp:262
msgid "Please select text to encrypt."
msgstr "選擇要加密的文字。"
@@ -967,12 +953,12 @@ msgstr "簽名過的文字"
msgid "Select file to encrypt"
msgstr "選擇要加密的檔案"
-#: src/ribbon-callbacks.cpp:1584
+#: src/ribbon-callbacks.cpp:1608
#, fuzzy
msgid "No message selected"
msgstr "此訊息未被加密。"
-#: src/ribbon-callbacks.cpp:1641
+#: src/ribbon-callbacks.cpp:1665
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -980,13 +966,27 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1692
+#: src/ribbon-callbacks.cpp:1716
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "Error creating file\n"
+#~ "Please select another one"
+#~ msgstr "生成附件時出錯。"
+
+#, fuzzy
+#~ msgid "Error writing file"
+#~ msgstr "寫入流時出錯。"
+
+#, fuzzy
+#~ msgid "[PGP/MIME signature]"
+#~ msgstr "完好的簽名"
+
+#, fuzzy
#~ msgid "This message is not signed.\n"
#~ msgstr "此訊息未被加密。"
commit 8ec22330f956b2854cbeae2d710c761cf6de3d9d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 09:02:44 2017 +0100
Add tracing in engine-assuan for T3401
--
GnuPG-Bug-Id: T3401
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 87036d6..8907c18 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -383,8 +383,12 @@ send_options (assuan_context_t ctx, void *hwnd, pid_t *r_pid)
char numbuf[50];
*r_pid = (pid_t)(-1);
+ log_debug ("%s:%s: transacting",
+ SRCNAME, __func__);
err = assuan_transact (ctx, "GETINFO pid", getinfo_pid_cb, r_pid,
NULL, NULL, NULL, NULL);
+ log_debug ("%s:%s: transaction done",
+ SRCNAME, __func__);
if (!err && *r_pid == (pid_t)(-1))
{
log_debug ("%s:%s: server did not return a PID", SRCNAME, __func__);
@@ -397,10 +401,14 @@ send_options (assuan_context_t ctx, void *hwnd, pid_t *r_pid)
if (!err && hwnd)
{
+ log_debug ("%s:%s: Sending Window ID",
+ SRCNAME, __func__);
snprintf (numbuf, sizeof numbuf, "%x", handle_to_int (hwnd));
err = send_one_option (ctx, "window-id", numbuf);
}
+ log_debug ("%s:%s: Returning.",
+ SRCNAME, __func__);
return err;
}
@@ -418,6 +426,8 @@ connect_uiserver (assuan_context_t *r_ctx, pid_t *r_pid, ULONG *r_cmdid,
*r_pid = (pid_t)(-1);
*r_cmdid = 0;
+ log_debug ("%s:%s: Connecting",
+ SRCNAME, __func__);
socket_name = get_socket_name();
if (!socket_name || !*socket_name)
{
@@ -434,6 +444,8 @@ connect_uiserver (assuan_context_t *r_ctx, pid_t *r_pid, ULONG *r_cmdid,
return rc;
}
+ log_debug ("%s:%s: initial try",
+ SRCNAME, __func__);
rc = assuan_socket_connect (*r_ctx, socket_name, -1, 0);
if (rc)
{
@@ -464,14 +476,26 @@ connect_uiserver (assuan_context_t *r_ctx, pid_t *r_pid, ULONG *r_cmdid,
for (count = 0; count < 10; count++)
{
Sleep (1000);
+ log_debug ("%s:%s: Connect try %i to \"%s\"",
+ SRCNAME, __func__, count, socket_name);
rc = assuan_socket_connect (*r_ctx, socket_name, -1, 0);
if (!rc)
- break;
+ {
+ break;
+ log_debug ("Connected");
+ }
}
}
}
gpgol_unlock_spawning (&lock);
+ log_debug ("%s:%s: Spawn unlocked.",
+ SRCNAME, __func__);
+ }
+ else
+ {
+ log_debug ("%s:%s: initial try succeded",
+ SRCNAME, __func__);
}
if (rc)
@@ -487,7 +511,11 @@ connect_uiserver (assuan_context_t *r_ctx, pid_t *r_pid, ULONG *r_cmdid,
if (debug_flags & DEBUG_ASSUAN)
assuan_set_log_stream (*ctx, debug_file);
#endif
+ log_debug ("%s:%s: About to send options",
+ SRCNAME, __func__);
rc = send_options (*r_ctx, hwnd, r_pid);
+ log_debug ("%s:%s: Options sent to uiserver",
+ SRCNAME, __func__);
if (rc)
{
assuan_release (*r_ctx);
@@ -1556,10 +1584,13 @@ op_assuan_encrypt (protocol_t protocol,
detect_protocol = !(protocol_name = get_protocol_name (protocol));
+ TRACEPOINT;
err = connect_uiserver (&ctx, &pid, &cmdid, hwnd);
+ TRACEPOINT;
if (err)
return err;
+ TRACEPOINT;
if ((err = create_io_pipe (inpipe, pid, 1)))
return err;
if ((err = create_io_pipe (outpipe, pid, 0)))
@@ -1567,15 +1598,18 @@ op_assuan_encrypt (protocol_t protocol,
close_pipe (inpipe);
return err;
}
+ TRACEPOINT;
cld = xcalloc (1, sizeof *cld);
cld->closure = encrypt_closure;
cld->filter = filter;
+ TRACEPOINT;
err = assuan_transact (ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);
if (err)
goto leave;
send_session_info (ctx, filter);
+ TRACEPOINT;
/* If a sender has been supplied, tell the server about it. We
don't care about error because servers may not implement SENDER
@@ -1597,6 +1631,7 @@ op_assuan_encrypt (protocol_t protocol,
if (err)
goto leave;
}
+ TRACEPOINT;
/* If the protocol has not been given, let the UI server tell us the
protocol to use. If we know that we will also sign the message,
@@ -1605,11 +1640,13 @@ op_assuan_encrypt (protocol_t protocol,
if (detect_protocol)
{
protocol = PROTOCOL_UNKNOWN;
+ TRACEPOINT;
err = assuan_transact (ctx,
(flags & ENGINE_FLAG_SIGN_FOLLOWS)
? "PREP_ENCRYPT --expect-sign": "PREP_ENCRYPT",
NULL, NULL, NULL, NULL,
prep_foo_status_cb, &protocol);
+ TRACEPOINT;
if (err)
{
if (gpg_err_code (err) == GPG_ERR_ASS_UNKNOWN_CMD)
@@ -1634,7 +1671,9 @@ op_assuan_encrypt (protocol_t protocol,
? "PREP_ENCRYPT --protocol=%s --expect-sign"
: "PREP_ENCRYPT --protocol=%s",
protocol_name);
+ TRACEPOINT;
err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
+ TRACEPOINT;
if (err)
{
if (gpg_err_code (err) == GPG_ERR_ASS_UNKNOWN_CMD)
@@ -1658,7 +1697,9 @@ op_assuan_encrypt (protocol_t protocol,
handle_to_int (outpipe[1]));
else
snprintf (line, sizeof line, "OUTPUT FD=%d", handle_to_int (outpipe[1]));
+ TRACEPOINT;
err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
+ TRACEPOINT;
if (err)
goto leave;
@@ -1669,6 +1710,7 @@ op_assuan_encrypt (protocol_t protocol,
cmdid, NULL, 0, 1);
enqueue_callback ("output", ctx, outdata, outpipe[0], 0, finalize_handler,
cmdid, NULL, 1 /* Wait on success */, 1);
+ TRACEPOINT;
encstate = xcalloc (1, sizeof *encstate);
encstate->filter = filter;
@@ -1714,8 +1756,10 @@ op_assuan_encrypt_bottom (struct engine_assuan_encstate_s *encstate,
{
snprintf (line, sizeof line, "ENCRYPT --protocol=%s",
encstate->protocol_name);
+ TRACEPOINT;
err = start_command (encstate->ctx, encstate->cld,
encstate->cmdid, line);
+ TRACEPOINT;
encstate->cld = NULL; /* Now owned by start_command. */
}
@@ -1734,6 +1778,7 @@ op_assuan_encrypt_bottom (struct engine_assuan_encstate_s *encstate,
else
engine_private_set_cancel (encstate->filter, encstate->ctx);
xfree (encstate);
+ TRACEPOINT;
return err;
}
commit 4351cc3cb5c6345bf369e73c35f6796b22d10987
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Nov 20 08:45:36 2017 +0100
Bail out immediately on send if crypt not needed
* src/mailitem-events.cpp (EVENT_SINK_INVOKE): Break early
in case mail is not encrypted.
--
This should increase stability when sending mails and
this fixes that the body of unencrypted mails is not
wiped *cough*
GnuPG-Bug-Id: T3511
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index 2f1a866..7797b1d 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -345,6 +345,13 @@ EVENT_SINK_INVOKE(MailItemEvents)
*/
log_oom_extra ("%s:%s: Send : %p",
SRCNAME, __func__, m_mail);
+ if (!m_mail->needs_crypto ())
+ {
+ log_debug ("%s:%s: No crypto neccessary. Passing send for unencrypted %p",
+ SRCNAME, __func__, m_mail);
+ break;
+ }
+
if (parms->cArgs != 1 || parms->rgvarg[0].vt != (VT_BOOL | VT_BYREF))
{
log_debug ("%s:%s: Uncancellable send event.",
-----------------------------------------------------------------------
Summary of changes:
NEWS | 9 ++-
po/de.po | 185 ++++++++++++++++++++++++----------------------
po/fr.po | 178 ++++++++++++++++++++++----------------------
po/pt.po | 185 ++++++++++++++++++++++++----------------------
po/sv.po | 191 +++++++++++++++++++++++++-----------------------
po/zh_CN.po | 178 ++++++++++++++++++++++----------------------
po/zh_TW.po | 178 ++++++++++++++++++++++----------------------
src/engine-assuan.c | 47 +++++++++++-
src/mailitem-events.cpp | 7 ++
9 files changed, 622 insertions(+), 536 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list