[git] GpgOL - branch, master, updated. gpgol-2.0.5-3-gc574893
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Dec 8 10:26:16 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 c574893790b041dca19b8fe6fd45fe10b0b8b58e (commit)
via 096a92f2c6c308edb21ad4ab072c1fc3a460ba66 (commit)
from 049157abd5e78fde074c096dee4480eef1aa8efa (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 c574893790b041dca19b8fe6fd45fe10b0b8b58e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 10:21:35 2017 +0100
Fix g sync account warning
* src/mail.cpp (Mail::encrypt_sign): Handle encoding
(Mail::Mail): Initialize check correctly.
diff --git a/src/mail.cpp b/src/mail.cpp
index dd58f6d..be7be31 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -130,7 +130,9 @@ Mail::Mail (LPDISPATCH mailitem) :
m_needs_encrypt(false),
m_moss_position(0),
m_crypto_flags(0),
- m_type(MSGTYPE_UNKNOWN)
+ m_type(MSGTYPE_UNKNOWN),
+ m_do_inline(false),
+ m_is_gsuite(false)
{
if (get_mail_for_item (mailitem))
{
@@ -995,46 +997,63 @@ Mail::encrypt_sign ()
int n_att_usable = count_usable_attachments (att_table);
mapi_release_attach_table (att_table);
/* Check for attachments if we have some abort. */
+
+ wchar_t *w_title = utf8_to_wchar (_(
+ "GpgOL: Oops, G Suite Sync account detected"));
if (n_att_usable)
{
- MessageBox (window,
+ wchar_t *msg = utf8_to_wchar (
_("G Suite Sync breaks outgoing crypto mails "
"with attachments.\nUsing crypto and attachments "
"with G Suite Sync is not supported.\n\n"
- "See: https://dev.gnupg.org/T3545 for details."),
- _("GpgOL: Oops, G Suite Sync account detected"),
- MB_ICONINFORMATION|MB_OK);
+ "See: https://dev.gnupg.org/T3545 for details."));
+ MessageBoxW (window,
+ msg,
+ w_title,
+ MB_ICONINFORMATION|MB_OK);
+ xfree (msg);
+ xfree (w_title);
return -1;
}
if (flags == 2)
{
- MessageBox (window,
- _("G Suite Sync breaks outgoing signed mails.\n"
+ wchar_t *msg = utf8_to_wchar (
+ _("G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync "
"is not supported.\n\n"
- "See: https://dev.gnupg.org/T3545 for details."),
- _("GpgOL: Oops, G Suite Sync account detected"),
- MB_ICONINFORMATION|MB_OK);
+ "See: https://dev.gnupg.org/T3545 for details."));
+ MessageBoxW (window,
+ msg,
+ w_title,
+ MB_ICONINFORMATION|MB_OK);
+ xfree (msg);
+ xfree (w_title);
return -1;
}
if (flags == 3)
{
- if(MessageBox (window,
+ wchar_t *msg = utf8_to_wchar (
_("G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync "
"is not supported.\n\n"
"See: https://dev.gnupg.org/T3545 for details.\n\n"
- "Do you want to only encrypt the message?"),
- _("GpgOL: Oops, G Suite Sync account detected"),
- MB_ICONINFORMATION|MB_YESNO) != IDYES)
+ "Do you want to only encrypt the message?"));
+ if(MessageBoxW (window,
+ msg,
+ w_title,
+ MB_ICONINFORMATION|MB_YESNO) != IDYES)
{
+ xfree (msg);
+ xfree (w_title);
return -1;
}
else
{
flags = 1;
}
+ xfree (msg);
}
+ xfree (w_title);
}
m_do_inline = m_is_gsuite ? true : opt.inline_pgp;
commit 096a92f2c6c308edb21ad4ab072c1fc3a460ba66
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 8 10:21:26 2017 +0100
Auto update po files
--
diff --git a/po/de.po b/po/de.po
index 5fc7681..4ca6b60 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -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:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
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:342
+#: src/mail.cpp:344
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:347
+#: src/mail.cpp:349
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:352
+#: src/mail.cpp:354
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:392
+#: src/mail.cpp:394
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -420,19 +420,23 @@ msgstr ""
"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder singiert sein, "
"aber GpgOL kann deren Kryptostatus nicht anzeigen."
-#: src/mail.cpp:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
-#: src/mail.cpp:752
+#: src/mail.cpp:754
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:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -440,16 +444,12 @@ msgid ""
"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"
+"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 "GpgOL: Oops, G Suite Sync Konto erkannt"
-
-#: src/mail.cpp:1012
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -457,12 +457,12 @@ msgid ""
"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"
+"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
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -472,100 +472,100 @@ msgid ""
"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"
+"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
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
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:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr "Die Nachricht ist signiert aber die überprüfung schlug fehl mit:"
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
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:1988
+#: src/mail.cpp:2007
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
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:2009
+#: src/mail.cpp:2028
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:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -574,12 +574,12 @@ msgstr ""
"Die Idenität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -591,11 +591,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -605,70 +605,70 @@ msgstr ""
"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
"haben. Seit dem %s."
-#: src/mail.cpp:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
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:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -676,49 +676,49 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
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:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
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:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
diff --git a/po/fr.po b/po/fr.po
index 6fa15f4..904db18 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -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:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -377,47 +377,51 @@ msgstr ""
"Ceci est un message chiffré.\n"
"Veuillez le sélectionner pour plus d'informations."
-#: src/mail.cpp:342
+#: src/mail.cpp:344
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:347
+#: src/mail.cpp:349
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:352
+#: src/mail.cpp:354
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:392
+#: src/mail.cpp:394
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:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:752
+#: src/mail.cpp:754
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -425,11 +429,7 @@ msgid ""
"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
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -437,7 +437,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1023
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -447,105 +447,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:1867
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1988
+#: src/mail.cpp:2007
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2009
+#: src/mail.cpp:2028
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -553,133 +553,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, 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:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index ce714ac..7a86af1 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -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:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
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:342
+#: src/mail.cpp:344
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:347
+#: src/mail.cpp:349
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:352
+#: src/mail.cpp:354
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:392
+#: src/mail.cpp:394
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -420,21 +420,25 @@ 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:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
msgid "Encrypted message"
msgstr "Mensagem encriptada"
-#: src/mail.cpp:752
+#: src/mail.cpp:754
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:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -442,11 +446,7 @@ msgid ""
"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
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -454,7 +454,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1023
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -464,91 +464,91 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:1867
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
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:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
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:1988
+#: src/mail.cpp:2007
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:2009
+#: src/mail.cpp:2028
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:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -557,11 +557,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -572,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:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -585,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:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
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:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -654,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:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
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:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
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:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Clica aqui para localizar o certificado no servidor de chaves X509 "
diff --git a/po/sv.po b/po/sv.po
index cc0bf31..0eeae5b 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -163,12 +163,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -366,47 +366,51 @@ msgid ""
"Click for more information. "
msgstr ""
-#: src/mail.cpp:342
+#: src/mail.cpp:344
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:347
+#: src/mail.cpp:349
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:352
+#: src/mail.cpp:354
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:392
+#: src/mail.cpp:394
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:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:752
+#: src/mail.cpp:754
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -414,11 +418,7 @@ msgid ""
"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
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -426,7 +426,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1023
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -436,105 +436,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:1867
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1988
+#: src/mail.cpp:2007
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2009
+#: src/mail.cpp:2028
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -542,133 +542,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, 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:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index df91d3b..a698198 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -167,12 +167,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤销这个文件夹吗？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -365,47 +365,51 @@ msgstr ""
"此消息已加密。\n"
"点击此处获得更多信息。"
-#: src/mail.cpp:342
+#: src/mail.cpp:344
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:347
+#: src/mail.cpp:349
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:352
+#: src/mail.cpp:354
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:392
+#: src/mail.cpp:394
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:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:752
+#: src/mail.cpp:754
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -413,11 +417,7 @@ msgid ""
"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
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -425,7 +425,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1023
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -435,105 +435,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:1867
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1988
+#: src/mail.cpp:2007
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2009
+#: src/mail.cpp:2028
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -541,133 +541,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, 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:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6edd31c..6f6f59e 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-12-08 06:49+0100\n"
+"POT-Creation-Date: 2017-12-08 10:21+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"
@@ -167,12 +167,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤銷這個資料夾嗎？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1607 src/mail.cpp:1678
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1626 src/mail.cpp:1697
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1608 src/mail.cpp:1679
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1627 src/mail.cpp:1698
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -365,47 +365,51 @@ msgstr ""
"此訊息已加密。\n"
"點選此處獲得更多資訊。"
-#: src/mail.cpp:342
+#: src/mail.cpp:344
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:347
+#: src/mail.cpp:349
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:352
+#: src/mail.cpp:354
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:392
+#: src/mail.cpp:394
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:395
+#: src/mail.cpp:397
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:751 src/mail.cpp:1922
+#: src/mail.cpp:753 src/mail.cpp:1941
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:752
+#: src/mail.cpp:754
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1001
+#: src/mail.cpp:1002
+msgid "GpgOL: Oops, G Suite Sync account detected"
+msgstr ""
+
+#: src/mail.cpp:1006
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -413,11 +417,7 @@ msgid ""
"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
+#: src/mail.cpp:1021
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -425,7 +425,7 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1023
+#: src/mail.cpp:1036
msgid ""
"G Suite Sync breaks outgoing signed mails.\n"
"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
@@ -435,105 +435,105 @@ msgid ""
"Do you want to only encrypt the message?"
msgstr ""
-#: src/mail.cpp:1867
+#: src/mail.cpp:1886
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1871
+#: src/mail.cpp:1890
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1875
+#: src/mail.cpp:1894
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1879
+#: src/mail.cpp:1898
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1883
+#: src/mail.cpp:1902
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1887
+#: src/mail.cpp:1906
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1891
+#: src/mail.cpp:1910
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1900 src/mail.cpp:1902 src/ribbon-callbacks.cpp:1604
+#: src/mail.cpp:1919 src/mail.cpp:1921 src/ribbon-callbacks.cpp:1604
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1914
+#: src/mail.cpp:1933
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:1918
+#: src/mail.cpp:1937
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:1925 src/ribbon-callbacks.cpp:1627
+#: src/mail.cpp:1944 src/ribbon-callbacks.cpp:1627
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:1936 src/mail.cpp:1947
+#: src/mail.cpp:1955 src/mail.cpp:1966
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:1939
+#: src/mail.cpp:1958
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:1976
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1961
+#: src/mail.cpp:1980
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:1965
+#: src/mail.cpp:1984
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:1988
+#: src/mail.cpp:2007
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:1992
+#: src/mail.cpp:2011
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:1996
+#: src/mail.cpp:2015
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2009
+#: src/mail.cpp:2028
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2014
+#: src/mail.cpp:2033
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2022
+#: src/mail.cpp:2041
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2032
+#: src/mail.cpp:2051
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -541,133 +541,133 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2048
+#: src/mail.cpp:2067
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2055
+#: src/mail.cpp:2074
#, 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:2069
+#: src/mail.cpp:2088
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2070
+#: src/mail.cpp:2089
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2078
+#: src/mail.cpp:2097
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2083
+#: src/mail.cpp:2102
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2106
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2091
+#: src/mail.cpp:2110
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:2099
+#: src/mail.cpp:2118
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:2103
+#: src/mail.cpp:2122
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2107
+#: src/mail.cpp:2126
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2111
+#: src/mail.cpp:2130
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2115 src/mail.cpp:2119
+#: src/mail.cpp:2134 src/mail.cpp:2138
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2124
+#: src/mail.cpp:2143
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2130
+#: src/mail.cpp:2149
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2143
+#: src/mail.cpp:2162
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2147
+#: src/mail.cpp:2166
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2152
+#: src/mail.cpp:2171
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2175
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2166
+#: src/mail.cpp:2185
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2170
+#: src/mail.cpp:2189
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2178
+#: src/mail.cpp:2197
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2182
+#: src/mail.cpp:2201
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2193
+#: src/mail.cpp:2212
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2197
+#: src/mail.cpp:2216
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2217
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2221
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2203
+#: src/mail.cpp:2222
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 150 +++++++++++++++++++++++++++++------------------------------
po/fr.po | 138 +++++++++++++++++++++++++++---------------------------
po/pt.po | 138 +++++++++++++++++++++++++++---------------------------
po/sv.po | 138 +++++++++++++++++++++++++++---------------------------
po/zh_CN.po | 138 +++++++++++++++++++++++++++---------------------------
po/zh_TW.po | 138 +++++++++++++++++++++++++++---------------------------
src/mail.cpp | 47 +++++++++++++------
7 files changed, 453 insertions(+), 434 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list