[git] GpgOL - branch, master, updated. gpgol-1.4.0-256-gafb10a7

by Andre Heinecke cvs at cvs.gnupg.org
Tue Jan 17 11:56:55 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  afb10a7a8b17f0e0028b43ae4d9c613bbecc4c18 (commit)
       via  13380236374cbfbc7eb0558ba3377ddad0d32adc (commit)
      from  fdc2575c657abd4e7630cbb1461a9f270ea2046a (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 afb10a7a8b17f0e0028b43ae4d9c613bbecc4c18
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jan 17 11:55:55 2017 +0100

    Update translations and add german translation
    
    * po/de.po: Translate
    * po/fr.po, po/pt.po, po/sv.po, po/zh_CN.po, po/zh_TW.po: Auto update.

diff --git a/po/de.po b/po/de.po
index 18c0269..2be8a89 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the GpgOL package.
 #
 # Werner Koch <wk at gnupg.org>, 2005, 2007.
-# Andre Heinecke <andre.heinecke at intevation.de>, 2016.
+# Andre Heinecke <andre.heinecke at intevation.de>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: GpgOL 1.0.0\n"
 "Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2017-01-13 15:34+0100\n"
-"PO-Revision-Date: 2016-11-14 15:02+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+0100\n"
+"PO-Revision-Date: 2017-01-17 11:54+0100\n"
 "Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
 "Language-Team: American English <kde-i18n-doc at kde.org>\n"
 "Language: en_US\n"
@@ -45,32 +45,35 @@ msgid "&Sign new messages by default"
 msgstr "Neue Nachrichten per Voreinstellung signieren"
 
 #: src/addin-options.cpp:45
-#, fuzzy
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
-msgstr "&OpenPGP mails ohne Anhänge als inline-pgp verschlüsseln"
+msgstr "&OpenPGP Nachrichten ohne Anhänge als PGP/Inline verschlüsseln"
+
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr "Krypto &Einstellungen beim Antworten und weiterleiten übernehmen."
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr "Debug..."
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr "GnuPG konfigurieren "
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr "Version"
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr "Die Benutzeroberfläche zu ändern erfordert einen Neustart von Outlook"
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -78,8 +81,8 @@ msgstr "Die Benutzeroberfläche zu ändern erfordert einen Neustart von Outlook"
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -167,55 +170,51 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "Möchten Sie diesen Ordner von GpgOL befreien?"
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 msgid "GpgOL: Encrypted Message"
 msgstr "GpgOL: Verschlüsselte Nachricht"
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
-#, fuzzy
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
-msgstr "GpgOL: Verifizierter Absender"
+msgstr "GpgOL: Vertraute Absenderadresse"
 
 #: src/gpgoladdin.cpp:798
-#, fuzzy
 msgid "Encrypt the message"
-msgstr "Die Nachricht verschlüsseln."
+msgstr "Die Nachricht verschlüsseln"
 
 #: src/gpgoladdin.cpp:800
-#, fuzzy
 msgid "Encrypts the message and all attachments before sending"
-msgstr "Verschlüsselt die Nachricht und alle Anhänge beim Mailversand."
+msgstr "Verschlüsselt die Nachricht und alle ihre Anhänge vor dem versenden"
 
 #: src/gpgoladdin.cpp:802
-#, fuzzy
 msgid "Sign the message"
-msgstr "Die Nachricht signieren."
+msgstr "Die Nachricht signieren"
 
 #: src/gpgoladdin.cpp:804
-#, fuzzy
 msgid "Sign the message and all attachments before sending"
-msgstr "Verschlüsselt die Nachricht und alle Anhänge beim Mailversand. "
+msgstr "Die Nachricht und alle ihre Anhänge vor dem senden signieren"
 
 #: src/gpgoladdin.cpp:807
-#, fuzzy
 msgid "Sign and encrypt the message"
-msgstr "Entschlüsseln der Nachricht."
+msgstr "Nachricht signieren und verschlüsseln"
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
+"Die Nachricht zu verschlüsseln und zu signieren bedeutet das die Empfänger "
+"sicher sein können das niemand die Nachricht modifiziert hat und das nur die "
+"Empfänger die Nachricht lesen können"
 
 #: src/gpgoladdin.cpp:813
-#, fuzzy
 msgid "Open the settings dialog for GpgOL"
-msgstr "Die Einstellungen von GpgOL öffnen. "
+msgstr "Die Einstellungen von GpgOL öffnen"
 
 #: src/gpgoladdin.cpp:863 src/gpgoladdin.cpp:981
 msgid "Secure"
-msgstr ""
+msgstr "Sicher"
 
 #: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1143
 msgid "Sign"
@@ -385,6 +384,9 @@ msgid ""
 "The unsigned / unencrypted attachments are:\n"
 "\n"
 msgstr ""
+"Nicht alle Anhänge waren verschlüsselt order signiert.\n"
+"Die unsignierten / unverschlüsselten Anhänge sind:\n"
+"\n"
 
 #: src/mail.cpp:289
 msgid ""
@@ -392,6 +394,9 @@ msgid ""
 "The unsigned attachments are:\n"
 "\n"
 msgstr ""
+"Nicht alle Anhänge sind signiert.\n"
+"Die unsignierten Anhänge sind:\n"
+"\n"
 
 #: src/mail.cpp:294
 msgid ""
@@ -399,18 +404,23 @@ msgid ""
 "The unencrypted attachments are:\n"
 "\n"
 msgstr ""
+"Nicht alle Anhänge sind verschlüsselt.\n"
+"Die unverschlüsselten Anhänge sind:\n"
+"\n"
 
 #: src/mail.cpp:332
 msgid ""
 "Note: The attachments may be encrypted or signed on a file level but the "
 "GpgOL status does not apply to them."
 msgstr ""
+"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder singiert sein, "
+"aber GpgOL kann deren Kryptostatus nicht anzeigen."
 
 #: src/mail.cpp:335
 msgid "GpgOL Warning"
-msgstr ""
+msgstr "GpgOL Warnung"
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachricht"
 
@@ -418,222 +428,218 @@ 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:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
-msgstr ""
+msgstr "Sicherheit Stufe 4"
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
-msgstr ""
+msgstr "Vertrauen Stufe 4"
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
-msgstr ""
+msgstr "Sicherheit Stufe 3"
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
-msgstr ""
+msgstr "Vertrauen Stufe 3"
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
-msgstr ""
+msgstr "Sicherheit Stufe 2"
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
-msgstr ""
+msgstr "Vertrauen Stufe 2"
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
-msgstr ""
+msgstr "Unsicher"
 
-#: src/mail.cpp:1615
-#, fuzzy
+#: src/mail.cpp:1680
 msgid "Signed and encrypted message"
-msgstr "Verschlüsselte Nachricht"
+msgstr "Signierte und verschlüsselte Nachricht"
 
-#: src/mail.cpp:1619
-#, fuzzy
+#: src/mail.cpp:1684
 msgid "Signed message"
-msgstr "Die Nachricht signieren."
+msgstr "Signierte Nachricht"
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
-#, fuzzy
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 msgid "Insecure message"
-msgstr "Verschlüsselte Nachricht"
+msgstr "Unsichere Nachricht"
 
-#: src/mail.cpp:1635
-#, fuzzy
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
-msgstr "Sie können nicht sicher sein wer der Absender dieser Nachricht ist."
+msgstr ""
+"Sie können nicht sicher sein wer die Nachricht gesendet, modifiziert oder "
+"während der Übertragung gelesen hat."
 
-#: src/mail.cpp:1640
-#, fuzzy
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
-msgstr "Sie können nicht sicher sein wer der Absender dieser Nachricht ist."
+msgstr ""
+"Aber Sie können nicht sicher sein wer der Absender der Nachricht ist da "
+"diese nicht signiert wurde."
 
-#: src/mail.cpp:1664
-#, fuzzy
+#: src/mail.cpp:1729
 msgid "You signed this message."
-msgstr "Die Nachricht signieren."
+msgstr "Sie haben diese Nachricht signiert."
 
-#: src/mail.cpp:1668
-#, fuzzy
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
-msgstr ""
-"Der Absender ist nicht verifizert da:\n"
-"\n"
+msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
-msgstr ""
+#: src/mail.cpp:1737
+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:1685
-#, fuzzy
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
-msgstr "wurde nicht von genügend vertrauenswürdigen Schlüsseln beglaubigt. "
+msgstr ""
+"The Identität des Absenders wurde von mehreren vertrauenswürdigen Personen "
+"beglaubigt."
 
-#: src/mail.cpp:1690
-#, fuzzy, c-format
+#: src/mail.cpp:1755
+#, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
-"wurde von dem vertrauenswürden Zertifikatsaussteller:\n"
+"Die Idenität des Absenders wurde bestätigt von:\n"
 "'%s'\n"
-"ausgestellt.\n"
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
+"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
 "history with this address starting on %s.\n"
 "You encrypted %i and verified %i messages since."
 msgstr ""
+"Die Absenderadresse ist vertrauenswürdig, da Sie eine längere "
+"Kommunikationshistorie mit dieser Adresse aufgebaut haben.\n"
+"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
+"Signaturen geprüft."
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
-msgstr ""
+msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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 ""
+"Die Absenderadresse ist noch nicht vertrauenswürdig da Sie erst %i "
+"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
+"haben. Seit dem %s."
 
-#: src/mail.cpp:1745
-#, fuzzy
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
-msgstr ""
-"Der Absender ist nicht verifizert da:\n"
-"\n"
+msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
 
-#: src/mail.cpp:1746
-#, fuzzy
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
-msgstr ""
-"Der Absender ist nicht verifizert da:\n"
-"\n"
+msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
 
-#: src/mail.cpp:1754
-#, fuzzy
+#: src/mail.cpp:1819
 msgid "The signature is invalid: \n"
-msgstr "Diese Signatur ist falsch.\n"
+msgstr "Die Signatur ist ungültig: \n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 msgid "The signature is expired.\n"
 msgstr "Die Signatur ist abgelaufen.\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr "Der verwendete Schlüssel"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used certificate"
 msgstr "Das verwendete Zertifikat"
 
-#: src/mail.cpp:1775
-#, fuzzy
+#: src/mail.cpp:1840
 msgid "is not available."
-msgstr "Die CRL ist nicht verfügbar\n"
+msgstr "ist nicht verfügbar."
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr "wurde zurückgezogen."
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr "ist veraltet. "
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr "ist nicht zum signieren vorgesehen. "
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr "wurde möglicherweise zurückgezogen."
 
-#: src/mail.cpp:1800
-#, fuzzy
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
-"steht in konflikt mit einem andere Schlüssel der bereits für diesen Absender "
-"verwendet wurde. "
+"ist nicht der gleiche Schlüssel der in der vergangenheit für diese Adresse "
+"verwendet wurde."
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr "passt nicht zu der mailaddresse: \"%s\". "
 
-#: src/mail.cpp:1817
-#, fuzzy
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
-msgstr "wurde nicht von genügend vertrauenswürdigen Schlüsseln beglaubigt. "
+msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
 
-#: src/mail.cpp:1821
-msgid "The sender marked this address as revoked."
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
 msgstr ""
+"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
+"die Zertifizierungsstelle ist unbekannt."
 
-#: src/mail.cpp:1825
-#, fuzzy
+#: src/mail.cpp:1893
+msgid "The sender marked this address as revoked."
+msgstr "Der Absender hat diese Adresse zurückgezogen."
+
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
-msgstr "ist als eigener Schlüssel markiert."
+msgstr "ist als nicht vertrauenswürdig markiert."
 
-#: src/mail.cpp:1831
-#, fuzzy
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
-msgstr ""
-"Klicken Sie hier um den Schlüssel auf dem konfigurierten Schlüsselserver zu "
-"suchen. "
+msgstr "Klicken Sie hier um den Schlüssel für diese Adresse zu ändern."
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr "Klicken Sie hier für Details zu dem Schlüssel"
 
-#: src/mail.cpp:1836
-#, fuzzy
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
-msgstr "Klicken Sie hier für Details zu dem Schlüssel"
+msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 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:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 "Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
@@ -650,11 +656,11 @@ msgstr ""
 "Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
 "(In der Menüleiste: \"Format\" => \"Nur Text\")"
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr "Sorry, dies ist leider noch nicht möglich"
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -676,7 +682,7 @@ msgstr ""
 "Beispielsweise durch einen Rechtsklick auf die Nachricht wenn diese nicht "
 "ausgewählt ist.\n"
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
@@ -909,14 +915,13 @@ msgstr "Dies ist GpgOL Version %s"
 
 #: src/parsecontroller.cpp:161
 msgid "Unknown Key:"
-msgstr ""
+msgstr "Unbekannter Schlüssel:"
 
 #: src/parsecontroller.cpp:176
 msgid "Decryption canceled or timed out."
 msgstr "Entschlüsselung abgebrochen oder Passworteingabe dauerte zu lange."
 
 #: src/parsecontroller.cpp:189
-#, fuzzy
 msgid ""
 "No secret key found to decrypt the message. It is encrypted to the following "
 "keys:"
@@ -925,9 +930,8 @@ msgstr ""
 "folgenden Schlüsseln lesbar:"
 
 #: src/parsecontroller.cpp:195
-#, fuzzy
 msgid "Could not decrypt the data: "
-msgstr "Daten konnten nicht entschlüsselt werden."
+msgstr "Daten konnten nicht entschlüsselt werden:"
 
 #: src/parsecontroller.cpp:202 src/parsecontroller.cpp:252
 msgid "Encrypted message (decryption not possible)"
@@ -1005,27 +1009,33 @@ msgstr "Signierter Text"
 msgid "Select file to encrypt"
 msgstr "Auswählen der zu verschlüsselnden Datei"
 
-#: src/ribbon-callbacks.cpp:1569
-#, fuzzy
+#: src/ribbon-callbacks.cpp:1595
 msgid "No message selected"
-msgstr "Diese Nachricht ist nicht verschlüsselt."
+msgstr "Keine Nachricht ausgewählt"
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
+"Sie können nicht sicher sein wer die Nachricht gesendet, modifiziert oder "
+"während der Übertragung gelesen hat.\n"
+"\n"
+"Klicken Sie hier um mehr zu erfahren."
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
 "There is no additional information available if it was actually sent by '%s' "
 "or if someone faked the sender address."
 msgstr ""
+"Die Nachricht ist nicht kryptographisch signiert.\n"
+"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:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."
diff --git a/po/fr.po b/po/fr.po
index 845434d..3cd2d70 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-01-13 15:34+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+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"
@@ -46,28 +46,32 @@ msgstr "&Signer les nouveaux messages par défaut"
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
 msgstr ""
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr ""
+
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr ""
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr ""
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr ""
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr ""
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -75,8 +79,8 @@ msgstr ""
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -163,12 +167,12 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "Voulez-vous récupérer ce dossier ?"
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 #, fuzzy
 msgid "GpgOL: Encrypted Message"
 msgstr "Déchiffrer le message"
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
 msgstr ""
 
@@ -197,7 +201,7 @@ msgstr "Déchiffrer le message"
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
@@ -400,7 +404,7 @@ msgstr ""
 msgid "GpgOL Warning"
 msgstr ""
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Déchiffrer le message"
@@ -409,91 +413,91 @@ msgstr "Déchiffrer le message"
 msgid "Please wait while the message is being decrypted / verified..."
 msgstr ""
 
-#: src/mail.cpp:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
 msgstr ""
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
 msgstr ""
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
 msgstr ""
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
 msgstr ""
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
 msgstr ""
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
 msgstr ""
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 #, fuzzy
 msgid "Encrypted"
 msgstr "Chiffrer"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
 msgstr ""
 
-#: src/mail.cpp:1615
+#: src/mail.cpp:1680
 #, fuzzy
 msgid "Signed and encrypted message"
 msgstr "Déchiffrer le message"
 
-#: src/mail.cpp:1619
+#: src/mail.cpp:1684
 #, fuzzy
 msgid "Signed message"
 msgstr "Déchiffrer le message"
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 #, fuzzy
 msgid "Insecure message"
 msgstr "Déchiffrer le message"
 
-#: src/mail.cpp:1635
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
 msgstr ""
 
-#: src/mail.cpp:1640
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
 msgstr ""
 
-#: src/mail.cpp:1664
+#: src/mail.cpp:1729
 #, fuzzy
 msgid "You signed this message."
 msgstr "Déchiffrer le message"
 
-#: src/mail.cpp:1668
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
 msgstr ""
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
+#: src/mail.cpp:1737
+msgid "The sender is allowed to certify identities for you."
 msgstr ""
 
-#: src/mail.cpp:1685
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
 msgstr ""
 
-#: src/mail.cpp:1690
+#: src/mail.cpp:1755
 #, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
@@ -501,107 +505,113 @@ msgid ""
 "You encrypted %i and verified %i messages since."
 msgstr ""
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
 msgstr ""
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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:1745
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1746
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1754
+#: src/mail.cpp:1819
 #, fuzzy
 msgid "The signature is invalid: \n"
 msgstr "Cette signature est valide\n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr ""
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 #, fuzzy
 msgid "The signature is expired.\n"
 msgstr "Cette signature est valide\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr ""
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 #, fuzzy
 msgid "The used certificate"
 msgstr "Erreur de vérification"
 
-#: src/mail.cpp:1775
+#: src/mail.cpp:1840
 #, fuzzy
 msgid "is not available."
 msgstr "La liste de révocation (CRL) n'est pas disponible\n"
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr ""
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr ""
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr ""
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr ""
 
-#: src/mail.cpp:1800
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr ""
 
-#: src/mail.cpp:1817
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
 msgstr ""
 
-#: src/mail.cpp:1821
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
+msgstr ""
+
+#: src/mail.cpp:1893
 msgid "The sender marked this address as revoked."
 msgstr ""
 
-#: src/mail.cpp:1825
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
 msgstr ""
 
-#: src/mail.cpp:1831
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
 msgstr ""
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr ""
 
-#: src/mail.cpp:1836
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
 msgstr ""
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 msgid "Click here to search the key on the configured keyserver."
 msgstr ""
 
-#: src/mail.cpp:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 
@@ -615,11 +625,11 @@ msgstr ""
 "et non des messages RTF. Merci de vérifier que seul le format texte\n"
 "a été sélectionné."
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr ""
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -631,7 +641,7 @@ msgid ""
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr "Note : Utilisation de marqueurs de compatibilité : %s"
@@ -929,19 +939,19 @@ msgstr "Texte signé"
 msgid "Select file to encrypt"
 msgstr "Sélectionner le fichier à chiffrer"
 
-#: src/ribbon-callbacks.cpp:1569
+#: src/ribbon-callbacks.cpp:1595
 #, fuzzy
 msgid "No message selected"
 msgstr "Ce message n'est pas chiffré"
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
@@ -949,7 +959,7 @@ msgid ""
 "or if someone faked the sender address."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."
diff --git a/po/pt.po b/po/pt.po
index 68f5348..dd12025 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-01-13 15:34+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+0100\n"
 "PO-Revision-Date: 2016-02-02 17:33+0000\n"
 "Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
 "Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -47,28 +47,32 @@ msgstr "Assinar novas mensagens por defeito"
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
 msgstr ""
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr ""
+
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr ""
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr ""
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr ""
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr ""
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -76,8 +80,8 @@ msgstr ""
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -164,12 +168,12 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "Queres reverter esta pasta?"
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 #, fuzzy
 msgid "GpgOL: Encrypted Message"
 msgstr "Encriptar a mensagem."
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
 msgstr ""
 
@@ -200,7 +204,7 @@ msgstr "Desencriptar a mensagem"
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
@@ -406,7 +410,7 @@ msgstr ""
 msgid "GpgOL Warning"
 msgstr ""
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Encriptar a mensagem."
@@ -415,91 +419,91 @@ msgstr "Encriptar a mensagem."
 msgid "Please wait while the message is being decrypted / verified..."
 msgstr ""
 
-#: src/mail.cpp:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
 msgstr ""
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
 msgstr ""
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
 msgstr ""
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
 msgstr ""
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
 msgstr ""
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
 msgstr ""
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 #, fuzzy
 msgid "Encrypted"
 msgstr "Encriptar"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
 msgstr ""
 
-#: src/mail.cpp:1615
+#: src/mail.cpp:1680
 #, fuzzy
 msgid "Signed and encrypted message"
 msgstr "Encriptar a mensagem."
 
-#: src/mail.cpp:1619
+#: src/mail.cpp:1684
 #, fuzzy
 msgid "Signed message"
 msgstr "Assinar a mensagem."
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 #, fuzzy
 msgid "Insecure message"
 msgstr "Encriptar a mensagem."
 
-#: src/mail.cpp:1635
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
 msgstr ""
 
-#: src/mail.cpp:1640
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
 msgstr ""
 
-#: src/mail.cpp:1664
+#: src/mail.cpp:1729
 #, fuzzy
 msgid "You signed this message."
 msgstr "Assinar a mensagem."
 
-#: src/mail.cpp:1668
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
 msgstr ""
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
+#: src/mail.cpp:1737
+msgid "The sender is allowed to certify identities for you."
 msgstr ""
 
-#: src/mail.cpp:1685
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
 msgstr ""
 
-#: src/mail.cpp:1690
+#: src/mail.cpp:1755
 #, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
@@ -507,107 +511,113 @@ msgid ""
 "You encrypted %i and verified %i messages since."
 msgstr ""
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
 msgstr ""
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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:1745
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1746
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1754
+#: src/mail.cpp:1819
 #, fuzzy
 msgid "The signature is invalid: \n"
 msgstr "Esta assinatura é válida\n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr ""
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 #, fuzzy
 msgid "The signature is expired.\n"
 msgstr "Esta assinatura é válida\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr ""
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 #, fuzzy
 msgid "The used certificate"
 msgstr "Überprüfung"
 
-#: src/mail.cpp:1775
+#: src/mail.cpp:1840
 #, fuzzy
 msgid "is not available."
 msgstr "O CRL não está disponível\n"
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr ""
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr ""
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr ""
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr ""
 
-#: src/mail.cpp:1800
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr ""
 
-#: src/mail.cpp:1817
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
 msgstr ""
 
-#: src/mail.cpp:1821
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
+msgstr ""
+
+#: src/mail.cpp:1893
 msgid "The sender marked this address as revoked."
 msgstr ""
 
-#: src/mail.cpp:1825
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
 msgstr ""
 
-#: src/mail.cpp:1831
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
 msgstr ""
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr ""
 
-#: src/mail.cpp:1836
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
 msgstr ""
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 msgid "Click here to search the key on the configured keyserver."
 msgstr ""
 
-#: src/mail.cpp:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 
@@ -621,11 +631,11 @@ msgstr ""
 "não mensagens RTF. Por favor certifica-te que apenas o formato\n"
 "de texto foi seleccionado."
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr ""
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -637,7 +647,7 @@ msgid ""
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr "Nota: A usar flags de compatibilidade: %s"
@@ -950,19 +960,19 @@ msgstr "Texto assinado"
 msgid "Select file to encrypt"
 msgstr "Selecciona ficheiro a encriptar"
 
-#: src/ribbon-callbacks.cpp:1569
+#: src/ribbon-callbacks.cpp:1595
 #, fuzzy
 msgid "No message selected"
 msgstr "Esta mensagem não está encriptada."
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
@@ -970,7 +980,7 @@ msgid ""
 "or if someone faked the sender address."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."
diff --git a/po/sv.po b/po/sv.po
index 9f150f8..605a9bd 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-01-13 15:34+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+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"
@@ -46,28 +46,32 @@ msgstr ""
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
 msgstr ""
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr ""
+
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr ""
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr ""
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr ""
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr ""
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -75,8 +79,8 @@ msgstr ""
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr ""
 
@@ -155,12 +159,12 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr ""
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 #, fuzzy
 msgid "GpgOL: Encrypted Message"
 msgstr "Dekryptera och validera meddelandet."
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
 msgstr ""
 
@@ -189,7 +193,7 @@ msgstr "Dekryptera och validera meddelandet."
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
@@ -389,7 +393,7 @@ msgstr ""
 msgid "GpgOL Warning"
 msgstr ""
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Dekryptera och validera meddelandet."
@@ -398,91 +402,91 @@ msgstr "Dekryptera och validera meddelandet."
 msgid "Please wait while the message is being decrypted / verified..."
 msgstr ""
 
-#: src/mail.cpp:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
 msgstr ""
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
 msgstr ""
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
 msgstr ""
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
 msgstr ""
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
 msgstr ""
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
 msgstr ""
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 #, fuzzy
 msgid "Encrypted"
 msgstr "Kryptering"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
 msgstr ""
 
-#: src/mail.cpp:1615
+#: src/mail.cpp:1680
 #, fuzzy
 msgid "Signed and encrypted message"
 msgstr "Dekryptera och validera meddelandet."
 
-#: src/mail.cpp:1619
+#: src/mail.cpp:1684
 #, fuzzy
 msgid "Signed message"
 msgstr "Dekryptera och validera meddelandet."
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 #, fuzzy
 msgid "Insecure message"
 msgstr "Dekryptera och validera meddelandet."
 
-#: src/mail.cpp:1635
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
 msgstr ""
 
-#: src/mail.cpp:1640
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
 msgstr ""
 
-#: src/mail.cpp:1664
+#: src/mail.cpp:1729
 #, fuzzy
 msgid "You signed this message."
 msgstr "Dekryptera och validera meddelandet."
 
-#: src/mail.cpp:1668
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
 msgstr ""
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
+#: src/mail.cpp:1737
+msgid "The sender is allowed to certify identities for you."
 msgstr ""
 
-#: src/mail.cpp:1685
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
 msgstr ""
 
-#: src/mail.cpp:1690
+#: src/mail.cpp:1755
 #, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
@@ -490,107 +494,113 @@ msgid ""
 "You encrypted %i and verified %i messages since."
 msgstr ""
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
 msgstr ""
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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:1745
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1746
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1754
+#: src/mail.cpp:1819
 #, fuzzy
 msgid "The signature is invalid: \n"
 msgstr "Den här signaturen är giltig\n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr ""
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 #, fuzzy
 msgid "The signature is expired.\n"
 msgstr "Den här signaturen är giltig\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr ""
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 #, fuzzy
 msgid "The used certificate"
 msgstr "Validering"
 
-#: src/mail.cpp:1775
+#: src/mail.cpp:1840
 #, fuzzy
 msgid "is not available."
 msgstr "Spärrlistan är inte tillgänglig\n"
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr ""
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr ""
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr ""
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr ""
 
-#: src/mail.cpp:1800
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr ""
 
-#: src/mail.cpp:1817
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
 msgstr ""
 
-#: src/mail.cpp:1821
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
+msgstr ""
+
+#: src/mail.cpp:1893
 msgid "The sender marked this address as revoked."
 msgstr ""
 
-#: src/mail.cpp:1825
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
 msgstr ""
 
-#: src/mail.cpp:1831
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
 msgstr ""
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr ""
 
-#: src/mail.cpp:1836
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
 msgstr ""
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 msgid "Click here to search the key on the configured keyserver."
 msgstr ""
 
-#: src/mail.cpp:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 
@@ -605,11 +615,11 @@ msgstr ""
 "och inte RTF-meddelanden. Se till att endast textformatet\n"
 "har valts i inställningarna."
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr ""
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -621,7 +631,7 @@ msgid ""
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr ""
@@ -891,18 +901,18 @@ msgstr ""
 msgid "Select file to encrypt"
 msgstr "Välj åtminstone en mottagarnyckel."
 
-#: src/ribbon-callbacks.cpp:1569
+#: src/ribbon-callbacks.cpp:1595
 msgid "No message selected"
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
@@ -910,7 +920,7 @@ msgid ""
 "or if someone faked the sender address."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 15dfbf9..bfa7bb5 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-01-13 15:34+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+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"
@@ -47,28 +47,32 @@ msgstr "默认签名新消息(&S)"
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
 msgstr ""
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr ""
+
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr ""
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr ""
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr ""
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr ""
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -76,8 +80,8 @@ msgstr ""
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -159,12 +163,12 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "你想要撤销这个文件夹吗?"
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 #, fuzzy
 msgid "GpgOL: Encrypted Message"
 msgstr "解密消息"
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr "解密消息"
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
@@ -388,7 +392,7 @@ msgstr ""
 msgid "GpgOL Warning"
 msgstr ""
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 #, fuzzy
 msgid "Encrypted message"
 msgstr "解密消息"
@@ -397,91 +401,91 @@ msgstr "解密消息"
 msgid "Please wait while the message is being decrypted / verified..."
 msgstr ""
 
-#: src/mail.cpp:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
 msgstr ""
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
 msgstr ""
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
 msgstr ""
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
 msgstr ""
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
 msgstr ""
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
 msgstr ""
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 #, fuzzy
 msgid "Encrypted"
 msgstr "加密"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
 msgstr ""
 
-#: src/mail.cpp:1615
+#: src/mail.cpp:1680
 #, fuzzy
 msgid "Signed and encrypted message"
 msgstr "解密消息"
 
-#: src/mail.cpp:1619
+#: src/mail.cpp:1684
 #, fuzzy
 msgid "Signed message"
 msgstr "解密消息"
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 #, fuzzy
 msgid "Insecure message"
 msgstr "解密消息"
 
-#: src/mail.cpp:1635
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
 msgstr ""
 
-#: src/mail.cpp:1640
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
 msgstr ""
 
-#: src/mail.cpp:1664
+#: src/mail.cpp:1729
 #, fuzzy
 msgid "You signed this message."
 msgstr "解密消息"
 
-#: src/mail.cpp:1668
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
 msgstr ""
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
+#: src/mail.cpp:1737
+msgid "The sender is allowed to certify identities for you."
 msgstr ""
 
-#: src/mail.cpp:1685
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
 msgstr ""
 
-#: src/mail.cpp:1690
+#: src/mail.cpp:1755
 #, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
@@ -489,107 +493,113 @@ msgid ""
 "You encrypted %i and verified %i messages since."
 msgstr ""
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
 msgstr ""
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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:1745
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1746
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1754
+#: src/mail.cpp:1819
 #, fuzzy
 msgid "The signature is invalid: \n"
 msgstr "签名有效\n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr ""
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 #, fuzzy
 msgid "The signature is expired.\n"
 msgstr "签名有效\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr ""
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 #, fuzzy
 msgid "The used certificate"
 msgstr "验证出错"
 
-#: src/mail.cpp:1775
+#: src/mail.cpp:1840
 #, fuzzy
 msgid "is not available."
 msgstr "证书吊销列表(CRL)不可用\n"
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr ""
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr ""
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr ""
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr ""
 
-#: src/mail.cpp:1800
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr ""
 
-#: src/mail.cpp:1817
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
 msgstr ""
 
-#: src/mail.cpp:1821
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
+msgstr ""
+
+#: src/mail.cpp:1893
 msgid "The sender marked this address as revoked."
 msgstr ""
 
-#: src/mail.cpp:1825
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
 msgstr ""
 
-#: src/mail.cpp:1831
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
 msgstr ""
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr ""
 
-#: src/mail.cpp:1836
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
 msgstr ""
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 msgid "Click here to search the key on the configured keyserver."
 msgstr ""
 
-#: src/mail.cpp:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 
@@ -603,11 +613,11 @@ msgstr ""
 "无富文本的消息。请保证只有文字格式\n"
 "被选中。"
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr ""
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -619,7 +629,7 @@ msgid ""
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr "注释:使用兼容性参数:%s"
@@ -914,19 +924,19 @@ msgstr "签名过的文本"
 msgid "Select file to encrypt"
 msgstr "选择要加密的文件"
 
-#: src/ribbon-callbacks.cpp:1569
+#: src/ribbon-callbacks.cpp:1595
 #, fuzzy
 msgid "No message selected"
 msgstr "此消息未被加密。"
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
@@ -934,7 +944,7 @@ msgid ""
 "or if someone faked the sender address."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2ba87ed..e0466e8 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-01-13 15:34+0100\n"
+"POT-Creation-Date: 2017-01-17 11:54+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"
@@ -47,28 +47,32 @@ msgstr "預設簽名新訊息(&S)"
 msgid "&Send OpenPGP mails without attachments as PGP/Inline"
 msgstr ""
 
-#: src/addin-options.cpp:50
+#: src/addin-options.cpp:47
+msgid "S&elect crypto settings automatically for reply and foward."
+msgstr ""
+
+#: src/addin-options.cpp:52
 msgid "Debug..."
 msgstr ""
 
-#: src/addin-options.cpp:51
+#: src/addin-options.cpp:53
 msgid "Configure GnuPG"
 msgstr ""
 
-#: src/addin-options.cpp:52
+#: src/addin-options.cpp:54
 msgid "Version "
 msgstr ""
 
-#: src/addin-options.cpp:128
+#: src/addin-options.cpp:132
 msgid "Changing the interface requires a restart of Outlook."
 msgstr ""
 
-#: src/addin-options.cpp:129 src/cmdbarcontrols.cpp:105 src/engine.c:377
+#: src/addin-options.cpp:133 src/cmdbarcontrols.cpp:105 src/engine.c:377
 #: src/explorers.cpp:204 src/explorers.cpp:209 src/gpgoladdin.cpp:312
 #: src/gpgoladdin.cpp:862 src/gpgoladdin.cpp:905 src/gpgoladdin.cpp:978
 #: src/gpgoladdin.cpp:980 src/gpgoladdin.cpp:1137 src/gpgoladdin.cpp:1220
 #: src/gpgoladdin.cpp:1226 src/gpgoladdin.cpp:1299 src/gpgoladdin.cpp:1303
-#: src/main.c:461 src/message.cpp:300 src/ribbon-callbacks.cpp:133
+#: src/main.c:464 src/message.cpp:300 src/ribbon-callbacks.cpp:133
 #: src/ribbon-callbacks.cpp:247 src/ribbon-callbacks.cpp:262
 #: src/ribbon-callbacks.cpp:274 src/ribbon-callbacks.cpp:311
 #: src/ribbon-callbacks.cpp:323 src/ribbon-callbacks.cpp:668
@@ -76,8 +80,8 @@ msgstr ""
 #: src/ribbon-callbacks.cpp:712 src/ribbon-callbacks.cpp:735
 #: src/ribbon-callbacks.cpp:795 src/ribbon-callbacks.cpp:1077
 #: src/ribbon-callbacks.cpp:1111 src/ribbon-callbacks.cpp:1123
-#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1629
-#: src/ribbon-callbacks.cpp:1679
+#: src/ribbon-callbacks.cpp:1148 src/ribbon-callbacks.cpp:1655
+#: src/ribbon-callbacks.cpp:1705
 msgid "GpgOL"
 msgstr "GpgOL"
 
@@ -159,12 +163,12 @@ msgstr ""
 msgid "Do you want to revert this folder?"
 msgstr "你想要撤銷這個資料夾嗎?"
 
-#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1380
+#: src/gpgoladdin.cpp:444 src/mail.cpp:1371 src/mail.cpp:1442
 #, fuzzy
 msgid "GpgOL: Encrypted Message"
 msgstr "解密訊息"
 
-#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1381
+#: src/gpgoladdin.cpp:445 src/mail.cpp:1372 src/mail.cpp:1443
 msgid "GpgOL: Trusted Sender Address"
 msgstr ""
 
@@ -193,7 +197,7 @@ msgstr "解密訊息"
 
 #: src/gpgoladdin.cpp:809
 msgid ""
-"Encrypting and cryptographically signing a message means that the recipient "
+"Encrypting and cryptographically signing a message means that the recipients "
 "can be sure that no one modified the message and only the recipients can "
 "read it"
 msgstr ""
@@ -388,7 +392,7 @@ msgstr ""
 msgid "GpgOL Warning"
 msgstr ""
 
-#: src/mail.cpp:656 src/mail.cpp:1623
+#: src/mail.cpp:656 src/mail.cpp:1688
 #, fuzzy
 msgid "Encrypted message"
 msgstr "解密訊息"
@@ -397,91 +401,91 @@ msgstr "解密訊息"
 msgid "Please wait while the message is being decrypted / verified..."
 msgstr ""
 
-#: src/mail.cpp:1568
+#: src/mail.cpp:1633
 msgid "Security Level 4"
 msgstr ""
 
-#: src/mail.cpp:1572
+#: src/mail.cpp:1637
 msgid "Trust Level 4"
 msgstr ""
 
-#: src/mail.cpp:1576
+#: src/mail.cpp:1641
 msgid "Security Level 3"
 msgstr ""
 
-#: src/mail.cpp:1580
+#: src/mail.cpp:1645
 msgid "Trust Level 3"
 msgstr ""
 
-#: src/mail.cpp:1584
+#: src/mail.cpp:1649
 msgid "Security Level 2"
 msgstr ""
 
-#: src/mail.cpp:1588
+#: src/mail.cpp:1653
 msgid "Trust Level 2"
 msgstr ""
 
-#: src/mail.cpp:1592
+#: src/mail.cpp:1657
 #, fuzzy
 msgid "Encrypted"
 msgstr "加密"
 
-#: src/mail.cpp:1601 src/mail.cpp:1603 src/ribbon-callbacks.cpp:1542
+#: src/mail.cpp:1666 src/mail.cpp:1668 src/ribbon-callbacks.cpp:1568
 msgid "Insecure"
 msgstr ""
 
-#: src/mail.cpp:1615
+#: src/mail.cpp:1680
 #, fuzzy
 msgid "Signed and encrypted message"
 msgstr "解密訊息"
 
-#: src/mail.cpp:1619
+#: src/mail.cpp:1684
 #, fuzzy
 msgid "Signed message"
 msgstr "解密訊息"
 
-#: src/mail.cpp:1626 src/ribbon-callbacks.cpp:1565
+#: src/mail.cpp:1691 src/ribbon-callbacks.cpp:1591
 #, fuzzy
 msgid "Insecure message"
 msgstr "解密訊息"
 
-#: src/mail.cpp:1635
+#: src/mail.cpp:1700
 msgid "You cannot be sure who sent, modified and read the message in transit."
 msgstr ""
 
-#: src/mail.cpp:1640
+#: src/mail.cpp:1705
 msgid "But you cannot be sure who sent the message because it is not signed."
 msgstr ""
 
-#: src/mail.cpp:1664
+#: src/mail.cpp:1729
 #, fuzzy
 msgid "You signed this message."
 msgstr "解密訊息"
 
-#: src/mail.cpp:1668
+#: src/mail.cpp:1733
 msgid "The senders identity was certified by yourself."
 msgstr ""
 
-#: src/mail.cpp:1672
-msgid "The sender is allowed to manage your mail trust."
+#: src/mail.cpp:1737
+msgid "The sender is allowed to certify identities for you."
 msgstr ""
 
-#: src/mail.cpp:1685
+#: src/mail.cpp:1750
 msgid "The senders identity was certified by several trusted people."
 msgstr ""
 
-#: src/mail.cpp:1690
+#: src/mail.cpp:1755
 #, c-format
 msgid ""
-"The senders identity is cerified by the trusted issuer:\n"
+"The senders identity is certified by the trusted issuer:\n"
 "'%s'\n"
 msgstr ""
 
-#: src/mail.cpp:1698
+#: src/mail.cpp:1763
 msgid "Some trusted people have certified the senders identity."
 msgstr ""
 
-#: src/mail.cpp:1708
+#: src/mail.cpp:1773
 #, c-format
 msgid ""
 "The senders address is trusted, because you have established a communication "
@@ -489,107 +493,113 @@ msgid ""
 "You encrypted %i and verified %i messages since."
 msgstr ""
 
-#: src/mail.cpp:1724
+#: src/mail.cpp:1789
 msgid "The senders signature was verified for the first time."
 msgstr ""
 
-#: src/mail.cpp:1731
+#: src/mail.cpp:1796
 #, 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:1745
+#: src/mail.cpp:1810
 msgid "But the sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1746
+#: src/mail.cpp:1811
 msgid "The sender address is not trustworthy because:"
 msgstr ""
 
-#: src/mail.cpp:1754
+#: src/mail.cpp:1819
 #, fuzzy
 msgid "The signature is invalid: \n"
 msgstr "簽名有效\n"
 
-#: src/mail.cpp:1759
+#: src/mail.cpp:1824
 msgid "There was an error verifying the signature.\n"
 msgstr ""
 
-#: src/mail.cpp:1763
+#: src/mail.cpp:1828
 #, fuzzy
 msgid "The signature is expired.\n"
 msgstr "簽名有效\n"
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 msgid "The used key"
 msgstr ""
 
-#: src/mail.cpp:1767
+#: src/mail.cpp:1832
 #, fuzzy
 msgid "The used certificate"
 msgstr "驗證出錯"
 
-#: src/mail.cpp:1775
+#: src/mail.cpp:1840
 #, fuzzy
 msgid "is not available."
 msgstr "證書吊銷列表(CRL)不可用\n"
 
-#: src/mail.cpp:1779
+#: src/mail.cpp:1844
 msgid "is revoked."
 msgstr ""
 
-#: src/mail.cpp:1783
+#: src/mail.cpp:1848
 msgid "is expired."
 msgstr ""
 
-#: src/mail.cpp:1787
+#: src/mail.cpp:1852
 msgid "is not meant for signing."
 msgstr ""
 
-#: src/mail.cpp:1791 src/mail.cpp:1795
+#: src/mail.cpp:1856 src/mail.cpp:1860
 msgid "could not be checked for revocation."
 msgstr ""
 
-#: src/mail.cpp:1800
+#: src/mail.cpp:1865
 msgid "is not the same as the key that was used for this address in the past."
 msgstr ""
 
-#: src/mail.cpp:1806
+#: src/mail.cpp:1871
 #, c-format
 msgid "does not claim the address: \"%s\"."
 msgstr ""
 
-#: src/mail.cpp:1817
+#: src/mail.cpp:1884
 msgid "is not certified by any trustworthy key."
 msgstr ""
 
-#: src/mail.cpp:1821
+#: src/mail.cpp:1888
+msgid ""
+"is not certified by a trustworthy Certificate Authority or the Certificate "
+"Authority is unknown."
+msgstr ""
+
+#: src/mail.cpp:1893
 msgid "The sender marked this address as revoked."
 msgstr ""
 
-#: src/mail.cpp:1825
+#: src/mail.cpp:1897
 msgid "is marked as not trustworthy."
 msgstr ""
 
-#: src/mail.cpp:1831
+#: src/mail.cpp:1903
 msgid "Click here to change the key used for this address."
 msgstr ""
 
-#: src/mail.cpp:1835
+#: src/mail.cpp:1907
 msgid "Click here for details about the key."
 msgstr ""
 
-#: src/mail.cpp:1836
+#: src/mail.cpp:1908
 msgid "Click here for details about the certificate."
 msgstr ""
 
-#: src/mail.cpp:1840
+#: src/mail.cpp:1912
 msgid "Click here to search the key on the configured keyserver."
 msgstr ""
 
-#: src/mail.cpp:1841
+#: src/mail.cpp:1913
 msgid "Click here to search the certificate on the configured X509 keyserver."
 msgstr ""
 
@@ -603,11 +613,11 @@ msgstr ""
 "無富文字的訊息。請保證只有文字格式\n"
 "被選中。"
 
-#: src/mailitem-events.cpp:282
+#: src/mailitem-events.cpp:284
 msgid "Sorry, that's not possible, yet"
 msgstr ""
 
-#: src/mailitem-events.cpp:284
+#: src/mailitem-events.cpp:286
 #, c-format
 msgid ""
 "GpgOL has prevented the change to the \"%s\" property.\n"
@@ -619,7 +629,7 @@ msgid ""
 "For example by right clicking but not selecting the message.\n"
 msgstr ""
 
-#: src/main.c:460
+#: src/main.c:463
 #, c-format
 msgid "Note: Using compatibility flags: %s"
 msgstr "註釋:使用相容性參數:%s"
@@ -916,19 +926,19 @@ msgstr "簽名過的文字"
 msgid "Select file to encrypt"
 msgstr "選擇要加密的檔案"
 
-#: src/ribbon-callbacks.cpp:1569
+#: src/ribbon-callbacks.cpp:1595
 #, fuzzy
 msgid "No message selected"
 msgstr "此訊息未被加密。"
 
-#: src/ribbon-callbacks.cpp:1589
+#: src/ribbon-callbacks.cpp:1615
 msgid ""
 "You cannot be sure who sent, modified and read the message in transit.\n"
 "\n"
 "Click here to learn more."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1626
+#: src/ribbon-callbacks.cpp:1652
 #, c-format
 msgid ""
 "The message was not cryptographically signed.\n"
@@ -936,7 +946,7 @@ msgid ""
 "or if someone faked the sender address."
 msgstr ""
 
-#: src/ribbon-callbacks.cpp:1677
+#: src/ribbon-callbacks.cpp:1703
 msgid ""
 "Could not find Kleopatra.\n"
 "Please reinstall Gpg4win with the Kleopatra component enabled."

commit 13380236374cbfbc7eb0558ba3377ddad0d32adc
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jan 17 11:55:45 2017 +0100

    Minor string improvements
    
    --

diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 9eda8c2..3968487 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -807,7 +807,7 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
     _("Sign and encrypt the message");
   const char *secureSTip =
     _("Encrypting and cryptographically signing a message means that the "
-      "recipient can be sure that no one modified the message and only the "
+      "recipients can be sure that no one modified the message and only the "
       "recipients can read it");
   const char *optsSTip =
     _("Open the settings dialog for GpgOL");
diff --git a/src/mail.cpp b/src/mail.cpp
index 03c2382..89219eb 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -1734,7 +1734,7 @@ Mail::get_crypto_details()
         }
       else if (four_check == 2)
         {
-          message = _("The sender is allowed to manage your mail trust.");
+          message = _("The sender is allowed to certify identities for you.");
         }
       else
         {
@@ -1752,7 +1752,7 @@ Mail::get_crypto_details()
   else if (level == 3 && !isOpenPGP)
     {
       /* Level three is the only level for trusted S/MIME keys. */
-      gpgrt_asprintf (&buf, _("The senders identity is cerified by the trusted issuer:\n'%s'\n"),
+      gpgrt_asprintf (&buf, _("The senders identity is certified by the trusted issuer:\n'%s'\n"),
                       m_sig.key().issuerName());
       message = buf;
       xfree (buf);

-----------------------------------------------------------------------

Summary of changes:
 po/de.po           | 306 +++++++++++++++++++++++++++--------------------------
 po/fr.po           | 142 +++++++++++++------------
 po/pt.po           | 142 +++++++++++++------------
 po/sv.po           | 142 +++++++++++++------------
 po/zh_CN.po        | 142 +++++++++++++------------
 po/zh_TW.po        | 142 +++++++++++++------------
 src/gpgoladdin.cpp |   2 +-
 src/mail.cpp       |   4 +-
 8 files changed, 541 insertions(+), 481 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org




More information about the Gnupg-commits mailing list