[git] GpgOL - branch, master, updated. gpgol-2.0.6-137-g536f069
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Apr 12 13:01:02 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via 536f0690ed85250756f1cc58dc957f8015e3785a (commit)
via 02a7a047e1912824ef8680446084fed1f4b230d0 (commit)
via 0f3ac66840961e2147d148d3d36017b675a3e896 (commit)
via 68ba8ea2d624c025fcd8fce7a0a1bdc6d79b431c (commit)
via 6f7b2db102838df077162b9b2d1f7df1f1716994 (commit)
from d13de350caa214e97ac18066ba9cdb8caef64ed8 (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 536f0690ed85250756f1cc58dc957f8015e3785a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 13:00:52 2018 +0200
Update NEWS for todays release
--
diff --git a/NEWS b/NEWS
index c773c0b..e127e5e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes for version 2.1.0 (unreleased)
+Noteworthy changes for version 2.1.0 (2018-04-12)
=================================================
* Encryption and Signing has been reworked to, again,
commit 02a7a047e1912824ef8680446084fed1f4b230d0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 13:00:17 2018 +0200
Update german l10n
* po/de.po: Translate.
diff --git a/po/de.po b/po/de.po
index 1690017..d0378bc 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: 2018-04-12 12:58+0200\n"
-"PO-Revision-Date: 2018-03-07 08:59+0100\n"
+"PO-Revision-Date: 2018-04-12 12:59+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"
@@ -125,9 +125,8 @@ msgid "GpgOL - Save attachment"
msgstr "GpgOL - Anlage Speichern"
#: src/common.c:1073
-#, fuzzy
msgid "GpgOL Error"
-msgstr "GpgOL"
+msgstr "GpgOL Fehler"
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
@@ -782,6 +781,9 @@ msgid ""
"They can't be permanently removed and will be shown again the next time this "
"message is opened."
msgstr ""
+"Anhänge sind Teil der Krypto-Nachricht.\n"
+"Sie können nicht permanent entfernt werden und werden beim "
+"nächsten öffnen dieser Nachricht wieder angezeigt."
#: src/main.c:466
#, c-format
commit 0f3ac66840961e2147d148d3d36017b675a3e896
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 12:58:10 2018 +0200
Auto update po files
--
diff --git a/po/de.po b/po/de.po
index f8b9ebb..1690017 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: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\n"
"PO-Revision-Date: 2018-03-07 08:59+0100\n"
"Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
"Language-Team: English <kde-i18n-de at kde.org>\n"
@@ -77,7 +77,7 @@ msgstr "Die Benutzeroberfläche zu ändern erfordert einen Neustart von Outlook"
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -124,6 +124,11 @@ msgstr "Die Zertifikatsverwaltung konnte nicht aufgerufen werden"
msgid "GpgOL - Save attachment"
msgstr "GpgOL - Anlage Speichern"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "GpgOL"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr "Debugausgabe (zur Problemanalyse)"
@@ -175,11 +180,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:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
@@ -383,7 +388,7 @@ msgstr ""
"Dies ist eine verschlüsselte Nachricht.\n"
"Klicken Sie hier um weitere Informationen zu erhalten. "
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -393,7 +398,7 @@ msgstr ""
"Die unsignierten / unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -403,7 +408,7 @@ msgstr ""
"Die unsignierten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -413,7 +418,7 @@ msgstr ""
"Die unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:373
+#: src/mail.cpp:375
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -421,15 +426,15 @@ msgstr ""
"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder signiert sein, "
"aber GpgOL kann deren Kryptostatus nicht anzeigen."
-#: src/mail.cpp:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr "Öschl Verzeichnis Bestätigung"
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -443,19 +448,19 @@ msgstr ""
"<p>Wenn sie dies nicht angefordert haben, können Sie diese Mail ignorieren.</"
"p>\n"
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
-#: src/mail.cpp:853
+#: src/mail.cpp:935
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:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -468,93 +473,93 @@ msgstr ""
"\n"
"Details siehe: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
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:2017
+#: src/mail.cpp:2126
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:2035
+#: src/mail.cpp:2144
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
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:2066
+#: src/mail.cpp:2175
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr "Die Identität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
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:2087
+#: src/mail.cpp:2196
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:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -563,12 +568,13 @@ msgstr ""
"Die Identität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr ""
-"Einige vertrauenswürdige Personen haben die Identität des Absenders beglaubigt."
+"Einige vertrauenswürdige Personen haben die Identität des Absenders "
+"beglaubigt."
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -580,11 +586,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr "Die Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -594,70 +600,70 @@ msgstr ""
"Nachrichten von diesem Absender verifiziert und %i Nachrichten verschlüsselt "
"haben. Seit dem %s."
-#: src/mail.cpp:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
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:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -665,59 +671,59 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
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:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifikat."
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
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:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klicken Sie hier um das Zertifikat auf dem konfigurierten X509 "
"Schlüsselserver zu suchen."
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Verschlüsselung nicht möglich!"
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -744,11 +750,11 @@ msgstr ""
"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
"(In der Menüleiste: \"Format\" => \"Nur Text\")"
-#: src/mailitem-events.cpp:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr "Sorry, dies ist leider noch nicht möglich"
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -763,23 +769,30 @@ msgstr ""
"Änderungen an Eigenschaften werden noch nicht für Krypto-Nachrichten "
"unterstützt.\n"
"\n"
-"Um dieses Problem zu umgehen, ändern Sie bitte die Eigenschaft wenn "
-"die Nachricht in keinem Fenster geöffnet ist und nicht in der "
-"Nachrichtenliste ausgewählt ist.\n"
+"Um dieses Problem zu umgehen, ändern Sie bitte die Eigenschaft wenn die "
+"Nachricht in keinem Fenster geöffnet ist und nicht in der Nachrichtenliste "
+"ausgewählt ist.\n"
"\n"
"Beispielsweise durch einen Rechtsklick auf die Nachricht, wenn diese nicht "
"ausgewählt ist.\n"
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr "[Kein Betreff]"
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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 "
@@ -789,7 +802,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:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1168,19 +1181,19 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Eintragung bestätigt."
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
msgid "Resolving recipients..."
msgstr "Empfänger auflösen..."
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr "Signierer auflösen..."
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
msgid "Encrypting..."
msgstr "Verschlüsseln..."
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr "Signieren..."
diff --git a/po/fr.po b/po/fr.po
index 77ffe1c..9e0b62a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\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"
@@ -75,7 +75,7 @@ msgstr ""
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -122,6 +122,11 @@ msgstr "Démarrer le gestionnaire de certificats"
msgid "GpgOL - Save attachment"
msgstr "GpgOL - Enregistrer le fichier joint"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "GpgOL"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr "Sortie Debug (pour analyser les problèmes)"
@@ -172,12 +177,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:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -378,42 +383,42 @@ msgstr ""
"Ceci est un message chiffré.\n"
"Veuillez le sélectionner pour plus d'informations."
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:373
+#: src/mail.cpp:375
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:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -422,20 +427,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:853
+#: src/mail.cpp:935
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -443,105 +448,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2017
+#: src/mail.cpp:2126
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2144
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2066
+#: src/mail.cpp:2175
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2196
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -549,142 +554,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, 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:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -704,11 +709,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:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -720,16 +725,23 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr "Note : Utilisation de marqueurs de compatibilité : %s"
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr "[pas de sujet]"
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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 "
@@ -739,7 +751,7 @@ msgstr ""
"autre session Outlook. Utiliser la commande \"déchiffrer/vérifier\" afin de "
"le rendre visible]"
-#: src/mapihelp.cpp:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1069,21 +1081,21 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
#, fuzzy
msgid "Resolving recipients..."
msgstr "Destinataires sélectionnés :"
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
#, fuzzy
msgid "Encrypting..."
msgstr "Chiffrement"
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 7b03a14..04122d7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\n"
"PO-Revision-Date: 2018-03-09 11:00+0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -78,7 +78,7 @@ msgstr "Mudar a interface necessita reiniciar o Outlook."
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -124,6 +124,11 @@ msgstr "Não foi possível iniciar o gestor de certificados"
msgid "GpgOL - Save attachment"
msgstr "GpgOL - Guardar anexo"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "GpgOL"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr "Debug output (para analisar problemas)"
@@ -175,11 +180,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
@@ -383,7 +388,7 @@ msgstr ""
"Esta é uma mensagem encriptada.\n"
"Clica para mais informação. "
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -393,7 +398,7 @@ msgstr ""
"Os anexos não-assinados / não-encriptados são:\n"
"\n"
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -403,7 +408,7 @@ msgstr ""
"Os anexos não-assinados são:\n"
"\n"
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -413,7 +418,7 @@ msgstr ""
"Os anexos não-encriptados são:\n"
"\n"
-#: src/mail.cpp:373
+#: src/mail.cpp:375
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -421,15 +426,15 @@ 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:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr "Confirmação de diretoria Pubkey"
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -443,21 +448,21 @@ msgstr ""
"<p>Se não pediste para publicar a tua Pubkey na diretoria do teu provedor, "
"simplesmente ignora esta mensagem.</p>\n"
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
msgid "Encrypted message"
msgstr "Mensagem encriptada"
-#: src/mail.cpp:853
+#: src/mail.cpp:935
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:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, conta G Suite Sync detetada"
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -469,91 +474,91 @@ msgstr ""
"\n"
"Vê: https://dev.gnupg.org/T3545 para detalhes."
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
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:2017
+#: src/mail.cpp:2126
msgid "The message was signed but the verification failed with:"
msgstr "A mensagem foi assinada, mas a verificação falhou com:"
-#: src/mail.cpp:2035
+#: src/mail.cpp:2144
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
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:2066
+#: src/mail.cpp:2175
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:2087
+#: src/mail.cpp:2196
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:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -562,11 +567,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -577,11 +582,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -590,68 +595,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:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
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:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -659,57 +664,57 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
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:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
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:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Clica aqui para localizar o certificado no servidor de chaves X509 "
"configurado."
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Encriptação não possível!"
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -735,11 +740,11 @@ msgstr ""
"não mensagens RTF. Por favor, certifica-te que apenas o formato\n"
"de texto foi selecionado."
-#: src/mailitem-events.cpp:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr "Desculpa, isso não é possível, ainda"
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -761,16 +766,23 @@ msgstr ""
"Por exemplo, ao clicar com o botão direito do rato, mas não selecionar a "
"mensagem.\n"
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr "Nota: A usar sinalizadores de compatibilidade: %s"
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr "[sem assunto]"
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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 "
@@ -780,7 +792,7 @@ msgstr ""
"sessão do Outlook. Usa o comando \"desencriptar/verificar\" para torná-lo "
"visível]"
-#: src/mapihelp.cpp:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1148,19 +1160,19 @@ msgstr "A tua Pubkey pode ser brevemente recuperada do teu domínio."
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Pedido confirmado!"
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
msgid "Resolving recipients..."
msgstr "A resolver destinatários..."
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr "A resolver assinantes..."
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
msgid "Encrypting..."
msgstr "A encriptar..."
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr "A assinar..."
diff --git a/po/sv.po b/po/sv.po
index 9ba884a..bcff6f3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\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"
@@ -75,7 +75,7 @@ msgstr ""
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -123,6 +123,11 @@ msgstr "Kunde inte starta nyckelhanteraren"
msgid "GpgOL - Save attachment"
msgstr "GPG - Spara dekrypterad bilaga"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "In-/Ut-fel"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr ""
@@ -164,12 +169,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -367,42 +372,42 @@ msgid ""
"Click for more information. "
msgstr ""
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:373
+#: src/mail.cpp:375
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:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -411,20 +416,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:853
+#: src/mail.cpp:935
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -432,105 +437,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2017
+#: src/mail.cpp:2126
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2144
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2066
+#: src/mail.cpp:2175
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2196
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -538,142 +543,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, 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:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -694,11 +699,11 @@ msgstr ""
"och inte RTF-meddelanden. Se till att endast textformatet\n"
"har valts i inställningarna."
-#: src/mailitem-events.cpp:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -710,23 +715,30 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr ""
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr ""
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1028,20 +1040,20 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
msgid "Resolving recipients..."
msgstr ""
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
#, fuzzy
msgid "Encrypting..."
msgstr "Kryptering"
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dba6840..6de3b27 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -76,7 +76,7 @@ msgstr ""
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -123,6 +123,11 @@ msgstr "运行密钥管理器"
msgid "GpgOL - Save attachment"
msgstr "GpgOL - 保存附件"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "GpgOL"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr "调试输出（用来分析问题）"
@@ -168,12 +173,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤销这个文件夹吗？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -366,42 +371,42 @@ msgstr ""
"此消息已加密。\n"
"点击此处获得更多信息。"
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:373
+#: src/mail.cpp:375
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:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -410,20 +415,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:853
+#: src/mail.cpp:935
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -431,105 +436,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2017
+#: src/mail.cpp:2126
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2144
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2066
+#: src/mail.cpp:2175
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2196
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -537,142 +542,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, 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:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密消息"
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -692,11 +697,11 @@ msgstr ""
"无富文本的消息。请保证只有文字格式\n"
"被选中。"
-#: src/mailitem-events.cpp:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -708,16 +713,23 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr "注释：使用兼容性参数：%s"
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr "[无主题]"
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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 "
@@ -726,7 +738,7 @@ msgstr ""
"[内容不可见，因为此消息已被另一个 Outlook 会话解密。使用解密/验证”命令使其可"
"见]"
-#: src/mapihelp.cpp:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1054,21 +1066,21 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
#, fuzzy
msgid "Resolving recipients..."
msgstr "当前收件人："
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
#, fuzzy
msgid "Encrypting..."
msgstr "加密"
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 465e359..b7e9ae5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-21 13:02+0100\n"
+"POT-Creation-Date: 2018-04-12 12:58+0200\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -76,7 +76,7 @@ msgstr ""
#: src/gpgoladdin.cpp:864 src/gpgoladdin.cpp:907 src/gpgoladdin.cpp:980
#: src/gpgoladdin.cpp:982 src/gpgoladdin.cpp:1018 src/gpgoladdin.cpp:1172
#: src/gpgoladdin.cpp:1255 src/gpgoladdin.cpp:1261 src/gpgoladdin.cpp:1334
-#: src/gpgoladdin.cpp:1338 src/mail.cpp:761 src/main.c:467 src/message.cpp:303
+#: src/gpgoladdin.cpp:1338 src/main.c:467 src/message.cpp:303
#: src/ribbon-callbacks.cpp:134 src/ribbon-callbacks.cpp:248
#: src/ribbon-callbacks.cpp:263 src/ribbon-callbacks.cpp:275
#: src/ribbon-callbacks.cpp:312 src/ribbon-callbacks.cpp:324
@@ -123,6 +123,11 @@ msgstr "執行金鑰管理器"
msgid "GpgOL - Save attachment"
msgstr "GpgOL - 儲存附件"
+#: src/common.c:1073
+#, fuzzy
+msgid "GpgOL Error"
+msgstr "GpgOL"
+
#: src/config-dialog.c:38
msgid "Debug output (for analysing problems)"
msgstr "偵錯輸出（用來分析問題）"
@@ -168,12 +173,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤銷這個資料夾嗎？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1685 src/mail.cpp:1756
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1794 src/mail.cpp:1865
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1686 src/mail.cpp:1757
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1795 src/mail.cpp:1866
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -366,42 +371,42 @@ msgstr ""
"此訊息已加密。\n"
"點選此處獲得更多資訊。"
-#: src/mail.cpp:323
+#: src/mail.cpp:325
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:328
+#: src/mail.cpp:330
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:333
+#: src/mail.cpp:335
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:373
+#: src/mail.cpp:375
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:376
+#: src/mail.cpp:378
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:843
+#: src/mail.cpp:925
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:844
+#: src/mail.cpp:926
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -410,20 +415,20 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:852 src/mail.cpp:2000
+#: src/mail.cpp:934 src/mail.cpp:2109
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:853
+#: src/mail.cpp:935
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1132
+#: src/mail.cpp:1234
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1236
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -431,105 +436,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1945
+#: src/mail.cpp:2054
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1949
+#: src/mail.cpp:2058
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1953
+#: src/mail.cpp:2062
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1957
+#: src/mail.cpp:2066
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1961
+#: src/mail.cpp:2070
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1965
+#: src/mail.cpp:2074
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1969
+#: src/mail.cpp:2078
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1978 src/mail.cpp:1980 src/ribbon-callbacks.cpp:1631
+#: src/mail.cpp:2087 src/mail.cpp:2089 src/ribbon-callbacks.cpp:1631
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1992
+#: src/mail.cpp:2101
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:1996
+#: src/mail.cpp:2105
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:2003 src/ribbon-callbacks.cpp:1654
+#: src/mail.cpp:2112 src/ribbon-callbacks.cpp:1654
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:2014 src/mail.cpp:2025
+#: src/mail.cpp:2123 src/mail.cpp:2134
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2017
+#: src/mail.cpp:2126
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2035
+#: src/mail.cpp:2144
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2039
+#: src/mail.cpp:2148
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2043
+#: src/mail.cpp:2152
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2066
+#: src/mail.cpp:2175
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:2070
+#: src/mail.cpp:2179
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2074
+#: src/mail.cpp:2183
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2087
+#: src/mail.cpp:2196
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2092
+#: src/mail.cpp:2201
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2100
+#: src/mail.cpp:2209
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2110
+#: src/mail.cpp:2219
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -537,142 +542,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2126
+#: src/mail.cpp:2235
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2133
+#: src/mail.cpp:2242
#, 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:2147
+#: src/mail.cpp:2256
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2148
+#: src/mail.cpp:2257
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2156
+#: src/mail.cpp:2265
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2161
+#: src/mail.cpp:2270
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2165
+#: src/mail.cpp:2274
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2169
+#: src/mail.cpp:2278
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:2177
+#: src/mail.cpp:2286
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:2181
+#: src/mail.cpp:2290
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2185
+#: src/mail.cpp:2294
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2189
+#: src/mail.cpp:2298
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2193 src/mail.cpp:2197
+#: src/mail.cpp:2302 src/mail.cpp:2306
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2311
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2317
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2221
+#: src/mail.cpp:2330
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2225
+#: src/mail.cpp:2334
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2230
+#: src/mail.cpp:2339
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2234
+#: src/mail.cpp:2343
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2244
+#: src/mail.cpp:2353
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2248
+#: src/mail.cpp:2357
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2256
+#: src/mail.cpp:2365
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2260
+#: src/mail.cpp:2369
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2271
+#: src/mail.cpp:2380
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2275
+#: src/mail.cpp:2384
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2276
+#: src/mail.cpp:2385
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2280
+#: src/mail.cpp:2389
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2390
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2509
+#: src/mail.cpp:2678
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密訊息"
-#: src/mail.cpp:2511
+#: src/mail.cpp:2680
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -692,11 +697,11 @@ msgstr ""
"無富文字的訊息。請保證只有文字格式\n"
"被選中。"
-#: src/mailitem-events.cpp:295
+#: src/mailitem-events.cpp:313 src/mailitem-events.cpp:805
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:297
+#: src/mailitem-events.cpp:315
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -708,16 +713,23 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
+#: src/mailitem-events.cpp:802
+msgid ""
+"Attachments are part of the crypto message.\n"
+"They can't be permanently removed and will be shown again the next time this "
+"message is opened."
+msgstr ""
+
#: src/main.c:466
#, c-format
msgid "Note: Using compatibility flags: %s"
msgstr "註釋：使用相容性參數：%s"
-#: src/mapihelp.cpp:1886 src/mapihelp.cpp:1894 src/mapihelp.cpp:1902
+#: src/mapihelp.cpp:1918 src/mapihelp.cpp:1926 src/mapihelp.cpp:1934
msgid "[no subject]"
msgstr "[無主題]"
-#: src/mapihelp.cpp:2527
+#: src/mapihelp.cpp:2559
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 "
@@ -726,7 +738,7 @@ msgstr ""
"[內容不可見，因為此訊息已被另一個 Outlook 會話解密。使用解密/驗證”命令使其可"
"見]"
-#: src/mapihelp.cpp:3421
+#: src/mapihelp.cpp:3453
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -1056,21 +1068,21 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:393
+#: src/cryptcontroller.cpp:404
#, fuzzy
msgid "Resolving recipients..."
msgstr "當前收件人："
-#: src/cryptcontroller.cpp:397
+#: src/cryptcontroller.cpp:408
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1004
+#: src/cryptcontroller.cpp:1042
#, fuzzy
msgid "Encrypting..."
msgstr "加密"
-#: src/cryptcontroller.cpp:1008
+#: src/cryptcontroller.cpp:1046
msgid "Signing..."
msgstr ""
commit 68ba8ea2d624c025fcd8fce7a0a1bdc6d79b431c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 12:49:35 2018 +0200
Hide attachment removal warning on revert
* src/mail.cpp (attachment_remove_warning_disabled): New.
(Mail::revert): Disable attachment warning.
* src/mailitem-events.cpp: Check if warnings are disabled.
--
On revert this would otherwise show the newly introduced
warning.
diff --git a/src/mail.cpp b/src/mail.cpp
index 2abff2a..cbff50d 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -94,7 +94,8 @@ Mail::Mail (LPDISPATCH mailitem) :
m_window(nullptr),
m_async_crypt_disabled(false),
m_is_forwarded_crypto_mail(false),
- m_is_send_again(false)
+ m_is_send_again(false),
+ m_disable_att_remove_warning(false)
{
if (get_mail_for_item (mailitem))
{
@@ -1491,6 +1492,8 @@ Mail::revert ()
return 0;
}
+ m_disable_att_remove_warning = true;
+
err = gpgol_mailitem_revert (m_mailitem);
if (err == -1)
{
@@ -1501,6 +1504,7 @@ Mail::revert ()
/* We need to reprocess the mail next time around. */
m_processed = false;
m_needs_wipe = false;
+ m_disable_att_remove_warning = false;
return 0;
}
diff --git a/src/mail.h b/src/mail.h
index ee108a2..d3b6afa 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -481,6 +481,10 @@ public:
*/
void set_is_send_again (bool value) { m_is_send_again = value; }
+
+ /* Attachment removal state variables. */
+ bool attachment_remove_warning_disabled () { return m_disable_att_remove_warning; }
+
private:
void update_categories ();
void update_sigstate ();
@@ -522,5 +526,6 @@ private:
std::string m_mime_data;
bool m_is_forwarded_crypto_mail; /* Is this a forward of a crypto mail */
bool m_is_send_again; /* Is this a send again of a crypto mail */
+ bool m_disable_att_remove_warning; /* Should not warn about attachment removal. */
};
#endif // MAIL_H
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index 3a262fe..e4dd961 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -793,7 +793,8 @@ EVENT_SINK_INVOKE(MailItemEvents)
{
log_oom_extra ("%s:%s: AttachmentRemove: %p",
SRCNAME, __func__, m_mail);
- if (!m_mail->is_crypto_mail () || attachRemoveWarnShown)
+ if (!m_mail->is_crypto_mail () || attachRemoveWarnShown ||
+ m_mail->attachment_remove_warning_disabled ())
{
return S_OK;
}
@@ -803,6 +804,7 @@ EVENT_SINK_INVOKE(MailItemEvents)
"time this message is opened."),
_("Sorry, that's not possible, yet"), MB_OK);
attachRemoveWarnShown = true;
+ return S_OK;
}
default:
commit 6f7b2db102838df077162b9b2d1f7df1f1716994
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Apr 12 12:49:08 2018 +0200
Ignore InternetCodepage changes
* src/mailitem-events.cpp: Ignore internetcodepage changes.
diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index e73e0ee..3a262fe 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -45,6 +45,7 @@ const wchar_t *prop_blacklist[] = {
L"OutlookVersion",
L"OutlookInternalVersion",
L"ReceivedTime",
+ L"InternetCodepage",
NULL };
typedef enum
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
po/de.po | 181 ++++++++++++++++++++++++++----------------------
po/fr.po | 168 +++++++++++++++++++++++---------------------
po/pt.po | 168 +++++++++++++++++++++++---------------------
po/sv.po | 168 +++++++++++++++++++++++---------------------
po/zh_CN.po | 168 +++++++++++++++++++++++---------------------
po/zh_TW.po | 168 +++++++++++++++++++++++---------------------
src/mail.cpp | 6 +-
src/mail.h | 5 ++
src/mailitem-events.cpp | 5 +-
10 files changed, 563 insertions(+), 476 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list