[git] GpgOL - branch, master, updated. gpgol-2.0.4-8-g049157a
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Dec 8 07:47:25 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 049157abd5e78fde074c096dee4480eef1aa8efa (commit)
via 3ed469f39170c8816f2f27d920a842ed9999dfff (commit)
via f5242c45c13b2be6fee4a6a4d3671a60f3714423 (commit)
via 18555363e32f5c0cd7b6fb168bd1a64de7a2b858 (commit)
from 3dedccb4d51397fb73014d17b3699fae78f1df06 (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 049157abd5e78fde074c096dee4480eef1aa8efa
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 07:43:45 2017 +0100
Post release version bump
--
diff --git a/NEWS b/NEWS
index 379b251..fa6a50f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes for version 2.0.6 (unreleased)
+=================================================
+
+
Noteworthy changes for version 2.0.5 (2017-12-08)
=================================================
diff --git a/configure.ac b/configure.ac
index c7fdb14..0e3f02d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ min_automake_version="1.14"
# (git tag -s gpgol-k.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.5])
+m4_define([mym4_version], [2.0.6])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 3ed469f39170c8816f2f27d920a842ed9999dfff
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 06:58:02 2017 +0100
Update news
--
diff --git a/NEWS b/NEWS
index de22758..379b251 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-Noteworthy changes for version 2.0.5 (unreleased)
+Noteworthy changes for version 2.0.5 (2017-12-08)
=================================================
+ * A crash when receiving crypto mails with attachments without
+ file extension has been fixed. (T3582).
+
+ * Fixed a cause for potentially undefined behavior when closing.
+
Noteworthy changes for version 2.0.4 (2017-12-05)
=================================================
commit f5242c45c13b2be6fee4a6a4d3671a60f3714423
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 06:56:25 2017 +0100
Update german translation
--
diff --git a/po/de.po b/po/de.po
index ff19753..5fc7681 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
"POT-Creation-Date: 2017-12-08 06:49+0100\n"
-"PO-Revision-Date: 2017-07-27 09:18+0100\n"
+"PO-Revision-Date: 2017-12-08 06:55+0100\n"
"Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
"Language-Team: English <kde-i18n-de at kde.org>\n"
"Language: en_US\n"
@@ -439,10 +439,15 @@ msgid ""
"\n"
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
+"G Suite Sync bricht ausgehende Krypto Mails mit anhängen.\n"
+"Die verwendung von Krypto und anhängen wird mit G Suite Sync nicht"
+" unterstützt.\n"
+"\n"
+"Details siehe: https://dev.gnupg.org/T3545"
#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
msgid "GpgOL: Oops, G Suite Sync account detected"
-msgstr ""
+msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
#: src/mail.cpp:1012
msgid ""
@@ -451,6 +456,11 @@ msgid ""
"\n"
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
+"G Suite Sync bricht ausgehende, signierte, Mails.\n"
+"Sicherung der Integrität (signieren) wird mit G Suite Sync nicht"
+" unterstützt.\n"
+"\n"
+"Details siehe: https://dev.gnupg.org/T3545"
#: src/mail.cpp:1023
msgid ""
@@ -461,6 +471,13 @@ msgid ""
"\n"
"Do you want to only encrypt the message?"
msgstr ""
+"G Suite Sync bricht ausgehende, signierte, Mails.\n"
+"Sicherung der Integrität (signieren) wird mit G Suite Sync nicht"
+" unterstützt.\n"
+"\n"
+"Details siehe: https://dev.gnupg.org/T3545\n"
+"\n"
+"Möchten Sie die Nachricht nur verschlüsseln?"
#: src/mail.cpp:1867
msgid "Security Level 4"
@@ -514,7 +531,7 @@ msgstr ""
#: src/mail.cpp:1939
msgid "The message was signed but the verification failed with:"
-msgstr ""
+msgstr "Die Nachricht ist signiert aber die überprüfung schlug fehl mit:"
#: src/mail.cpp:1957
msgid "The encryption was VS-NfD-compliant."
@@ -745,9 +762,8 @@ msgstr ""
"ausgewählt ist.\n"
#: src/mailitem-events.cpp:380
-#, fuzzy
msgid "GpgOL: Encryption not possible!"
-msgstr "GpgOL: Verschlüsselte Nachricht"
+msgstr "GpgOL: Verschlüsselung nicht möglich!"
#: src/mailitem-events.cpp:382
msgid ""
@@ -758,6 +774,12 @@ msgid ""
"If it still fails consider using an encrypted attachment or\n"
"switching to PGP/Inline in GpgOL's options."
msgstr ""
+"Outlook meldete einen Fehler beim senden der Mail.\n"
+"\n"
+"Bitte starten Sie Outlook neu und versuchen Sie es erneut.\n"
+"\n"
+"Wenn es weiterhin fehlschlägt könnten Sie ihre daten gegebenenfalls \n"
+"als verschlüsselten Anhang anhängen."
#: src/main.c:466
#, c-format
commit 18555363e32f5c0cd7b6fb168bd1a64de7a2b858
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 06:49:55 2017 +0100
Auto update po files
--
diff --git a/po/de.po b/po/de.po
index 4ff1451..ff19753 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
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:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
@@ -382,7 +382,7 @@ msgstr ""
"Dies ist eine verschlüsselte Nachricht.\n"
"Klicken Sie hier um weitere Informationen zu erhalten. "
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -392,7 +392,7 @@ msgstr ""
"Die unsignierten / unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -402,7 +402,7 @@ msgstr ""
"Die unsignierten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -412,7 +412,7 @@ msgstr ""
"Die unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -420,101 +420,135 @@ msgstr ""
"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder singiert sein, "
"aber GpgOL kann deren Kryptostatus nicht anzeigen."
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
-#: src/mail.cpp:711
+#: src/mail.cpp:752
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:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
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:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
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:1814
+#: src/mail.cpp:1988
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
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:1835
+#: src/mail.cpp:2009
msgid "The senders identity was certified by several trusted people."
msgstr ""
"Die Identität des Absenders wurde von mehreren vertrauenswürdigen Personen "
"beglaubigt."
-#: src/mail.cpp:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -523,12 +557,12 @@ msgstr ""
"Die Idenität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -540,11 +574,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -554,70 +588,70 @@ msgstr ""
"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
"haben. Seit dem %s."
-#: src/mail.cpp:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
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:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -625,49 +659,49 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
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:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
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:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
@@ -684,11 +718,11 @@ msgstr ""
"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
"(In der Menüleiste: \"Format\" => \"Nur Text\")"
-#: src/mailitem-events.cpp:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr "Sorry, dies ist leider noch nicht möglich"
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -710,12 +744,12 @@ msgstr ""
"Beispielsweise durch einen Rechtsklick auf die Nachricht wenn diese nicht "
"ausgewählt ist.\n"
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -730,11 +764,11 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr "[Kein Betreff]"
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
@@ -744,7 +778,7 @@ msgstr ""
"Outlook Sitzung entschlüsselt wurde. Verwenden Sie den Menüpunkt "
"\"entschlüsseln/überprüfen\" um den Inhalt wieder sichtbar zu machen.]"
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1035,11 +1069,11 @@ msgstr "Signierter Text"
msgid "Select file to encrypt"
msgstr "Auswählen der zu verschlüsselnden Datei"
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
msgid "No message selected"
msgstr "Keine Nachricht ausgewählt"
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -1050,7 +1084,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:1716
+#: src/ribbon-callbacks.cpp:1739
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 522e939..6fa15f4 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
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:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -377,141 +377,175 @@ msgstr ""
"Ceci est un message chiffré.\n"
"Veuillez le sélectionner pour plus d'informations."
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
msgstr ""
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:711
+#: src/mail.cpp:752
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1814
+#: src/mail.cpp:1988
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1835
+#: src/mail.cpp:2009
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -519,133 +553,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, 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:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -659,11 +693,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:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -675,12 +709,12 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Déchiffrer le message"
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -695,11 +729,11 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr "Note : Utilisation de marqueurs de compatibilité : %s"
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr "[pas de sujet]"
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
@@ -709,7 +743,7 @@ msgstr ""
"autre session Outlook. Utiliser la commande \"déchiffrer/vérifier\" afin de "
"le rendre visible]"
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -966,12 +1000,12 @@ msgstr "Texte signé"
msgid "Select file to encrypt"
msgstr "Sélectionner le fichier à chiffrer"
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
#, fuzzy
msgid "No message selected"
msgstr "Ce message n'est pas chiffré"
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -979,7 +1013,7 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1716
+#: src/ribbon-callbacks.cpp:1739
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 273a387..ce714ac 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
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:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
@@ -382,7 +382,7 @@ msgstr ""
"Esta é uma mensagem encriptada.\n"
"Clica para mais informação. "
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -392,7 +392,7 @@ msgstr ""
"Os anexos não-assinados / não-encriptados são:\n"
"\n"
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -402,7 +402,7 @@ msgstr ""
"Os anexos não-assinados são:\n"
"\n"
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -412,7 +412,7 @@ msgstr ""
"Os anexos não-encriptados são:\n"
"\n"
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -420,101 +420,135 @@ msgstr ""
"Nota: Os anexos podem ser encriptados ou assinados ao nível de ficheiro, mas "
"o status do GpgOL não se aplica a eles."
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
msgid "Encrypted message"
msgstr "Mensagem encriptada"
-#: src/mail.cpp:711
+#: src/mail.cpp:752
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
"Por favor aguarda enquanto a mensagem está a ser desencriptada / "
"verificada..."
-#: src/mail.cpp:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
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:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
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:1814
+#: src/mail.cpp:1988
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:1835
+#: src/mail.cpp:2009
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:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -523,11 +557,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -538,11 +572,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -551,68 +585,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:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
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:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -620,47 +654,47 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
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:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
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:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Clica aqui para localizar o certificado no servidor de chaves X509 "
@@ -676,11 +710,11 @@ msgstr ""
"não mensagens RTF. Por favor certifica-te que apenas o formato\n"
"de texto foi selecionado."
-#: src/mailitem-events.cpp:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr "Desculpa, isso não é possível, ainda"
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -702,12 +736,12 @@ msgstr ""
"Por exemplo, ao clicar com o botão direito do rato, mas não selecionar a "
"mensagem.\n"
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -722,11 +756,11 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr "Nota: A usar sinalizadores de compatibilidade: %s"
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr "[sem assunto]"
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
@@ -736,7 +770,7 @@ msgstr ""
"sessão do Outlook. Usa o comando \"desencriptar/verificar\" para torná-lo "
"visível]"
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1016,11 +1050,11 @@ msgstr "Texto assinado"
msgid "Select file to encrypt"
msgstr "Seleciona o ficheiro a encriptar"
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
msgid "No message selected"
msgstr "Nenhuma mensagem selecionada"
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -1031,7 +1065,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:1716
+#: src/ribbon-callbacks.cpp:1739
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 9638b8a..cc0bf31 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
msgid "GpgOL"
msgstr ""
@@ -163,12 +163,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -366,141 +366,175 @@ msgid ""
"Click for more information. "
msgstr ""
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
msgstr ""
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:711
+#: src/mail.cpp:752
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1814
+#: src/mail.cpp:1988
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1835
+#: src/mail.cpp:2009
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -508,133 +542,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, 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:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -649,11 +683,11 @@ msgstr ""
"och inte RTF-meddelanden. Se till att endast textformatet\n"
"har valts i inställningarna."
-#: src/mailitem-events.cpp:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -665,12 +699,12 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Dekryptera och validera meddelandet."
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -685,18 +719,18 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr ""
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr ""
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
"visible]"
msgstr ""
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -926,11 +960,11 @@ msgstr ""
msgid "Select file to encrypt"
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
msgid "No message selected"
msgstr ""
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -938,7 +972,7 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1716
+#: src/ribbon-callbacks.cpp:1739
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 4da861e..df91d3b 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
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:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -365,141 +365,175 @@ msgstr ""
"此消息已加密。\n"
"点击此处获得更多信息。"
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
msgstr ""
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:711
+#: src/mail.cpp:752
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1814
+#: src/mail.cpp:1988
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1835
+#: src/mail.cpp:2009
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -507,133 +541,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, 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:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -647,11 +681,11 @@ msgstr ""
"无富文本的消息。请保证只有文字格式\n"
"被选中。"
-#: src/mailitem-events.cpp:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -663,12 +697,12 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密消息"
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -683,11 +717,11 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr "注释：使用兼容性参数：%s"
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr "[无主题]"
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
@@ -696,7 +730,7 @@ msgstr ""
"[内容不可见，因为此消息已被另一个 Outlook 会话解密。使用解密/验证”命令使其可"
"见]"
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -951,12 +985,12 @@ msgstr "签名过的文本"
msgid "Select file to encrypt"
msgstr "选择要加密的文件"
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
#, fuzzy
msgid "No message selected"
msgstr "此消息未被加密。"
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -964,7 +998,7 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1716
+#: src/ribbon-callbacks.cpp:1739
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 f153b3a..6edd31c 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-20 09:10+0100\n"
+"POT-Creation-Date: 2017-12-08 06:49+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:1668 src/ribbon-callbacks.cpp:1718
+#: src/ribbon-callbacks.cpp:1691 src/ribbon-callbacks.cpp:1741
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:1446 src/mail.cpp:1517
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1447 src/mail.cpp:1518
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -365,141 +365,175 @@ msgstr ""
"此訊息已加密。\n"
"點選此處獲得更多資訊。"
-#: src/mail.cpp:338
+#: src/mail.cpp:342
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:343
+#: src/mail.cpp:347
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:348
+#: src/mail.cpp:352
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:386
+#: src/mail.cpp:392
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
msgstr ""
-#: src/mail.cpp:389
+#: src/mail.cpp:395
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:710 src/mail.cpp:1761
+#: src/mail.cpp:751 src/mail.cpp:1922
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:711
+#: src/mail.cpp:752
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1706
+#: src/mail.cpp:1001
+msgid ""
+"G Suite Sync breaks outgoing crypto mails with attachments.\n"
+"Using crypto and attachments with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1005 src/mail.cpp:1016 src/mail.cpp:1028
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1012
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details."
+msgstr ""
+
+#: src/mail.cpp:1023
+msgid ""
+"G Suite Sync breaks outgoing signed mails.\n"
+"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+"\n"
+"See: https://dev.gnupg.org/T3545 for details.\n"
+"\n"
+"Do you want to only encrypt the message?"
+msgstr ""
+
+#: src/mail.cpp:1867
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1710
+#: src/mail.cpp:1871
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1714
+#: src/mail.cpp:1875
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1718
+#: src/mail.cpp:1879
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1722
+#: src/mail.cpp:1883
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1726
+#: src/mail.cpp:1887
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1730
+#: src/mail.cpp:1891
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1739 src/mail.cpp:1741 src/ribbon-callbacks.cpp:1581
+#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1753
+#: src/mail.cpp:1914
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:1757
+#: src/mail.cpp:1918
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:1764 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:1774
+#: src/mail.cpp:1936 src/mail.cpp:1947
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1783
+#: src/mail.cpp:1939
+msgid "The message was signed but the verification failed with:"
+msgstr ""
+
+#: src/mail.cpp:1957
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1787
+#: src/mail.cpp:1961
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1791
+#: src/mail.cpp:1965
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1814
+#: src/mail.cpp:1988
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:1818
+#: src/mail.cpp:1992
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1822
+#: src/mail.cpp:1996
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:1835
+#: src/mail.cpp:2009
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:1840
+#: src/mail.cpp:2014
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:1848
+#: src/mail.cpp:2022
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:1858
+#: src/mail.cpp:2032
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -507,133 +541,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:1874
+#: src/mail.cpp:2048
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:1881
+#: src/mail.cpp:2055
#, 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:1895
+#: src/mail.cpp:2069
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1896
+#: src/mail.cpp:2070
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:1904
+#: src/mail.cpp:2078
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:1909
+#: src/mail.cpp:2083
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:1913
+#: src/mail.cpp:2087
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
msgid "The used key"
msgstr ""
-#: src/mail.cpp:1917
+#: src/mail.cpp:2091
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:1925
+#: src/mail.cpp:2099
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:1929
+#: src/mail.cpp:2103
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:1933
+#: src/mail.cpp:2107
msgid "is expired."
msgstr ""
-#: src/mail.cpp:1937
+#: src/mail.cpp:2111
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:1941 src/mail.cpp:1945
+#: src/mail.cpp:2115 src/mail.cpp:2119
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:1950
+#: src/mail.cpp:2124
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:1956
+#: src/mail.cpp:2130
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2143
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:1973
+#: src/mail.cpp:2147
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:1978
+#: src/mail.cpp:2152
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:1982
+#: src/mail.cpp:2156
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2166
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2170
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2004
+#: src/mail.cpp:2178
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2008
+#: src/mail.cpp:2182
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2019
+#: src/mail.cpp:2193
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:2197
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2024
+#: src/mail.cpp:2198
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2028
+#: src/mail.cpp:2202
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2029
+#: src/mail.cpp:2203
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
@@ -647,11 +681,11 @@ msgstr ""
"無富文字的訊息。請保證只有文字格式\n"
"被選中。"
-#: src/mailitem-events.cpp:305
+#: src/mailitem-events.cpp:292
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:307
+#: src/mailitem-events.cpp:294
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -663,12 +697,12 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:393
+#: src/mailitem-events.cpp:380
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密訊息"
-#: src/mailitem-events.cpp:395
+#: src/mailitem-events.cpp:382
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -683,11 +717,11 @@ msgstr ""
msgid "Note: Using compatibility flags: %s"
msgstr "註釋：使用相容性參數：%s"
-#: src/mapihelp.cpp:1713 src/mapihelp.cpp:1721 src/mapihelp.cpp:1729
+#: src/mapihelp.cpp:1786 src/mapihelp.cpp:1794 src/mapihelp.cpp:1802
msgid "[no subject]"
msgstr "[無主題]"
-#: src/mapihelp.cpp:2378
+#: src/mapihelp.cpp:2427
msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
@@ -696,7 +730,7 @@ msgstr ""
"[內容不可見，因為此訊息已被另一個 Outlook 會話解密。使用解密/驗證”命令使其可"
"見]"
-#: src/mapihelp.cpp:3273
+#: src/mapihelp.cpp:3310
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -953,12 +987,12 @@ msgstr "簽名過的文字"
msgid "Select file to encrypt"
msgstr "選擇要加密的檔案"
-#: src/ribbon-callbacks.cpp:1608
+#: src/ribbon-callbacks.cpp:1631
#, fuzzy
msgid "No message selected"
msgstr "此訊息未被加密。"
-#: src/ribbon-callbacks.cpp:1665
+#: src/ribbon-callbacks.cpp:1688
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -966,7 +1000,7 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:1716
+#: src/ribbon-callbacks.cpp:1739
msgid ""
"Could not find Kleopatra.\n"
"Please reinstall Gpg4win with the Kleopatra component enabled."
-----------------------------------------------------------------------
Summary of changes:
NEWS | 11 +++-
configure.ac | 2 +-
po/de.po | 206 +++++++++++++++++++++++++++++++++++++----------------------
po/fr.po | 178 ++++++++++++++++++++++++++++++---------------------
po/pt.po | 178 ++++++++++++++++++++++++++++++---------------------
po/sv.po | 178 ++++++++++++++++++++++++++++++---------------------
po/zh_CN.po | 178 ++++++++++++++++++++++++++++++---------------------
po/zh_TW.po | 178 ++++++++++++++++++++++++++++++---------------------
8 files changed, 672 insertions(+), 437 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list