From 5650e988d2c26dcf88f59ce740e1f725f20af5c2 Mon Sep 17 00:00:00 2001
From: Andre Heinecke
Date: Tue, 24 Jul 2018 09:23:13 +0200
Subject: [PATCH] Auto update po files
* po: Update
---
po/de.po | 429 +++++++++++++++++++++++++++++++++++-------------------------
po/fr.po | 412 +++++++++++++++++++++++++++++++++------------------------
po/nl.po | 425 ++++++++++++++++++++++++++++++++++-------------------------
po/pt.po | 425 ++++++++++++++++++++++++++++++++++-------------------------
po/sv.po | 390 ++++++++++++++++++++++++++++++------------------------
po/uk.po | 427 ++++++++++++++++++++++++++++++++++-------------------------
po/zh_CN.po | 408 +++++++++++++++++++++++++++++++++------------------------
po/zh_TW.po | 408 +++++++++++++++++++++++++++++++++------------------------
8 files changed, 1921 insertions(+), 1403 deletions(-)
diff --git a/po/de.po b/po/de.po
index 05e6c66..fe6bfde 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2018-06-12 13:40+0100\n"
"Last-Translator: aheinecke \n"
"Language-Team: English \n"
@@ -20,109 +20,145 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 2.0\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "Allgemein"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "S/MIME-Unterstützung einschalten"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "Senden von Nachrichten"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+#, fuzzy
+msgid "Configure GpgOL"
+msgstr "GnuPG konfigurieren "
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "Allgemein"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "Unsichere Nachricht"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr "GnuPG konfigurieren "
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr "Debug..."
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr "Version"
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr "Empfängerschlüssel automatisch auflösen"
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "Neue Nachrichten per Voreinstellung verschlüsseln"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "Neue Nachrichten per Voreinstellung signieren"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr "&OpenPGP-Nachrichten ohne Anhänge als PGP/Inline senden"
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr "Krypto-&Einstellungen beim Antworten und Weiterleiten übernehmen"
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
-msgstr "Empfängerschlüssel automatisch auflösen"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
+msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
-msgstr "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
+msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
-msgstr "GnuPG konfigurieren "
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
+msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
-msgstr "Version"
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
+msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
+
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-"Kleopatra konnte nicht gefunden werden. Bitte installieren Sie Gpg4win "
-"erneut mit der Komponente Kleopatra aktiviert."
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - Anlage Speichern"
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:1073
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
+
+#: src/common.cpp:768
msgid "GpgOL Error"
msgstr "GpgOL Fehler"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "Debugausgabe (zur Problemanalyse)"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
msgid "Encrypt the message"
msgstr "Die Nachricht verschlüsseln"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr "Verschlüsselt die Nachricht und alle ihre Anhänge vor dem versenden"
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
msgid "Sign the message"
msgstr "Die Nachricht signieren"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr "Die Nachricht und alle ihre Anhänge vor dem senden signieren"
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
msgid "Sign and encrypt the message"
msgstr "Nachricht signieren und verschlüsseln"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
@@ -132,27 +168,37 @@ msgstr ""
"sicher sein können das niemand die Nachricht modifiziert hat und das nur die "
"Empfänger die Nachricht lesen können"
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr "Die Einstellungen von GpgOL öffnen"
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr "Absichern"
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "Signieren"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr "Entschlüsselt &Drucken"
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -162,7 +208,7 @@ msgstr ""
"Die unsignierten / unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -172,7 +218,7 @@ msgstr ""
"Die unsignierten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -182,7 +228,7 @@ msgstr ""
"Die unverschlüsselten Anhänge sind:\n"
"\n"
-#: src/mail.cpp:374
+#: src/mail.cpp:414
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -190,11 +236,11 @@ msgstr ""
"Note: Die Anhänge könnten auf Dateiebene verschlüsselt oder signiert sein, "
"aber GpgOL kann deren Kryptostatus nicht anzeigen."
-#: src/mail.cpp:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr "GpgOL Warnung"
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, c-format
msgid ""
"Crypto operation failed:\n"
@@ -203,11 +249,11 @@ msgstr ""
"Krypto-Operation fehlgeschlagen:\n"
"%s"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr "Ãschl Verzeichnis Bestätigung"
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -221,31 +267,31 @@ msgstr ""
"Wenn sie dies nicht angefordert haben, können Sie diese Mail ignorieren."
"p>\n"
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
msgid "message"
msgstr "Nachricht"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
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:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr "HTML Anzeige deaktiviert."
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr "HTML Inhalte in unsignierten S/MIME Mails sind unsicher."
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr "GpgOL zeigt solche Mails nur als Text an."
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
msgid "This message is shown only once."
msgstr "Diese Meldung wird nur einmal angezeigt."
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
@@ -253,11 +299,11 @@ msgstr ""
"Bitten Sie den Absender die Nachrichten zu signieren oder\n"
"sie mit einem alternativen Text Teil zu senden."
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -270,97 +316,97 @@ msgstr ""
"\n"
"Details siehe: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
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:2266
+#: src/mail.cpp:2401
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:2284
+#: src/mail.cpp:2419
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
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:2315
+#: src/mail.cpp:2450
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr "Die Identität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
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:2336
+#: src/mail.cpp:2471
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:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -369,13 +415,17 @@ msgstr ""
"Die Identität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürdige Personen haben die Identität des Absenders "
"beglaubigt."
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -387,11 +437,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr "Die Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -401,70 +451,70 @@ msgstr ""
"Nachrichten von diesem Absender verifiziert und %i Nachrichten verschlüsselt "
"haben. Seit dem %s."
-#: src/mail.cpp:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
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:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -472,59 +522,59 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
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:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifikat."
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
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:2535
+#: src/mail.cpp:2678
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:2859
+#: src/mail.cpp:3000
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Verschlüsselung nicht möglich!"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -540,11 +590,11 @@ msgstr ""
"Wenn es weiterhin fehlschlägt könnten Sie ihre daten gegebenenfalls \n"
"als verschlüsselten Anhang anhängen."
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr "Sorry, dies ist leider noch nicht möglich"
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -566,32 +616,32 @@ msgstr ""
"Beispielsweise durch einen Rechtsklick auf die Nachricht, wenn diese nicht "
"ausgewählt ist.\n"
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr "Gefährliche Antwort"
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr "Gefährliche Weiterleitung"
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr "Unsignierte S/MIME Mails sind nicht integritätsgeschützt."
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
"Aus Sicherheitsgründen werden keine entschlüsselte Inhalte in die Antwort "
"aufgenommen."
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
msgstr ""
"Aus Sicherheitsgründen werden keine entschlüsselte Inhalte weitergeleitet."
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
msgid ""
"Attachments are part of the crypto message.\n"
"They can't be permanently removed and will be shown again the next time this "
@@ -601,32 +651,19 @@ msgstr ""
"Sie können nicht permanent entfernt werden und werden beim nächsten öffnen "
"dieser Nachricht wieder angezeigt."
-#: src/main.c:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[Kein Betreff]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-"[Aufgrund eines Verarbeitungsfehlers in GpgOL ist der Inhalt dieser "
-"Nachricht nicht sichtbar.]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr "Unbekannter Schlüssel:"
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr "Entschlüsselung abgebrochen oder Passworteingabe dauerte zu lange."
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
@@ -634,15 +671,15 @@ msgstr ""
"Kein geheimer Schlüssel gefunden der zu der Nachricht passt. Sie ist mit den "
"folgenden Schlüsseln lesbar:"
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr "Daten konnten nicht entschlüsselt werden: "
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr "Konnte die Mail nicht verarbeiten."
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
@@ -650,11 +687,11 @@ msgstr ""
"Daten sind nicht integritätsgeschützt. Das Entschlüsseln könnte ein "
"Sicherheitsproblem sein. (Kein MDC)"
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
msgid "Encrypted message (decryption not possible)"
msgstr "Verschlüsselte Nachricht (Entschlüsselung nicht möglich)"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
@@ -662,11 +699,11 @@ msgstr ""
"GnuPG konnte nicht gefunden werden. Bitte stellen sie sicher das Gpg4win "
"korrekt installiert ist."
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
msgid "No message selected"
msgstr "Keine Nachricht ausgewählt"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -677,7 +714,7 @@ msgstr ""
"Es gibt keine zusätzliche Information darüber ob sie wirklich von '%s' "
"gesendet wurde oder ob jemand die Absenderadresse vortäuscht."
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
@@ -685,9 +722,20 @@ msgstr ""
"Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
"Details:\n"
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+"Kleopatra konnte nicht gefunden werden. Bitte installieren Sie Gpg4win "
+"erneut mit der Komponente Kleopatra aktiviert."
+
+#: src/wks-helper.cpp:410
+#, fuzzy, c-format
+msgid ""
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -705,67 +753,86 @@ msgstr ""
"\n"
"Automatisch eintragen?"
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr "GpgOL: Ãschl Verzeichnis verfügbar!"
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr "GpgOL: Verzeichnis Anfrage fehlgeschlagen"
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
msgstr ""
-"Es ist möglich das ihnen ihr Mailprovider noch eine Bestätigungs-"
-"Anfrage sendet um die Eintragung abzuschlieÃen."
+"Es ist möglich das ihnen ihr Mailprovider noch eine Bestätigungs-Anfrage "
+"sendet um die Eintragung abzuschlieÃen."
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr "GpgOL: Registrierungs-Anfrage gesendet."
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr "Eintragung bestätigen?"
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr "GpgOL: Ãschl Verzeichnis Bestätigung"
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr "GpgOL: Eintragung fehlgeschlagen"
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr ""
"Ihr öffentlicher Schlüssel kann bald aus dem Verzeichnis abgerufen werden."
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Eintragung bestätigt."
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
msgid "No recipients for encryption selected."
msgstr "Keine Empfänger zum verschlüsseln ausgewählt."
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
msgid "Resolving recipients..."
msgstr "Empfänger auflösen..."
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr "Signierer auflösen..."
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
msgid "Encrypting..."
msgstr "Verschlüsseln..."
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr "Signieren..."
+#~ msgid "Message sending"
+#~ msgstr "Senden von Nachrichten"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - Anlage Speichern"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "Debugausgabe (zur Problemanalyse)"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr ""
+#~ "[Aufgrund eines Verarbeitungsfehlers in GpgOL ist der Inhalt dieser "
+#~ "Nachricht nicht sichtbar.]"
+
#~ msgid "Enable simplified interface (experimental)"
#~ msgstr "Vereinfachte Benutzeroberfläche aktivieren (experimentell)"
diff --git a/po/fr.po b/po/fr.po
index 8a30943..147a1db 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@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2015-10-01 17:05+0200\n"
"Last-Translator: Olivier Serve \n"
"Language-Team: French \n"
@@ -17,170 +17,217 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "Général"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "Activer le support S/MIME"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "Envoi du message"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+msgid "Configure GpgOL"
+msgstr ""
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "Général"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "Déchiffrer le message"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr ""
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr ""
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr ""
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr ""
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "&Chiffrer les nouveaux messages par défaut"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "&Signer les nouveaux messages par défaut"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr ""
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
+msgstr ""
+
+#: src/addin-options.cpp:62
+msgid "experimental"
msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - Enregistrer le fichier joint"
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
+
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
-#: src/common.c:1073
+#: src/common.cpp:768
#, 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)"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr ""
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
#, fuzzy
msgid "Encrypt the message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
#, fuzzy
msgid "Sign the message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
#, fuzzy
msgid "Sign and encrypt the message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
"read it"
msgstr ""
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr ""
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr ""
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "Signer"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "Chiffrer"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr ""
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:374
+#: src/mail.cpp:414
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:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, fuzzy, c-format
msgid ""
"Crypto operation failed:\n"
@@ -189,11 +236,11 @@ msgstr ""
"Ãchec du déchiffrement\n"
"(%s)"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -202,43 +249,43 @@ msgid ""
"directory, simply ignore this message.
\n"
msgstr ""
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
#, fuzzy
msgid "message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr ""
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr ""
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
#, fuzzy
msgid "This message is shown only once."
msgstr "Ce message n'est pas chiffré"
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
msgstr ""
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -246,110 +293,114 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -357,142 +408,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, 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:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -502,11 +553,11 @@ msgid ""
"switching to PGP/Inline in GpgOL's options."
msgstr ""
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -518,97 +569,84 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr ""
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr ""
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr ""
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
msgstr ""
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
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:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "Note : Utilisation de marqueurs de compatibilité : %s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[pas de sujet]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-"[Le contenu de ce message n'est pas visible à cause d'une erreur d'exécution "
-"de GpgOL.]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr ""
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr ""
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
msgstr ""
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr ""
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr ""
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
msgstr ""
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
#, fuzzy
msgid "Encrypted message (decryption not possible)"
msgstr "Il n'est pas possible de chiffrer ou signer un message vide."
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
msgstr ""
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
#, fuzzy
msgid "No message selected"
msgstr "Ce message n'est pas chiffré"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -616,15 +654,24 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
msgstr ""
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
+msgid ""
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+
+#: src/wks-helper.cpp:410
+#, c-format
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -634,67 +681,86 @@ msgid ""
"Register automatically?"
msgstr ""
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr ""
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr ""
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
msgstr ""
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr ""
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr ""
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr ""
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr ""
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr ""
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
#, fuzzy
msgid "No recipients for encryption selected."
msgstr "Il n'y a pas de destinataires vers qui chiffrer"
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
#, fuzzy
msgid "Resolving recipients..."
msgstr "Destinataires sélectionnés :"
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
#, fuzzy
msgid "Encrypting..."
msgstr "Chiffrement"
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr ""
+#~ msgid "Message sending"
+#~ msgstr "Envoi du message"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - Enregistrer le fichier joint"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "Sortie Debug (pour analyser les problèmes)"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "Note : Utilisation de marqueurs de compatibilité : %s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr ""
+#~ "[Le contenu de ce message n'est pas visible à cause d'une erreur "
+#~ "d'exécution de GpgOL.]"
+
#~ msgid ""
#~ "The user interface server is not available or could not be started in "
#~ "time. You may want to try again."
diff --git a/po/nl.po b/po/nl.po
index 899ab2f..121304a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 2.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2018-06-12 21:28+0200\n"
"Last-Translator: Erwin Bronkhorst \n"
"Language-Team: \n"
@@ -18,111 +18,147 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.11\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "Algemeen"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "S/MIME-ondersteuning inschakelen"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "Versturen van bericht"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+#, fuzzy
+msgid "Configure GpgOL"
+msgstr "GnuPG configureren"
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "Algemeen"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "Onveilig bericht"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr "GnuPG configureren"
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr "Debug..."
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr "Versie"
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr "Automatisch sleutels van ontvanger opzoeken"
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "Nieuwe berichten standaard &versleutelen"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "Nieuwe berichten standaard &ondertekenen"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr "OpenPGP-e-mailberichten zonder bijlage als PGP/Inline verzenden"
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
"Bij beantwoorden en doorsturen de versleutelings-instellingen automatisch "
"selecteren"
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
-msgstr "Automatisch sleutels van ontvanger opzoeken"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
+msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
-msgstr "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
+msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
-msgstr "GnuPG configureren"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
+msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
-msgstr "Versie"
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
+msgstr ""
+
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-"Kleopatra kon niet gevonden worden.\n"
-"Installeer Gpg4win opnieuw met het Kleopatra-component ingeschakeld."
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - Bijlage opslaan"
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
-#: src/common.c:1073
+#: src/common.cpp:768
msgid "GpgOL Error"
msgstr "GpgOL Fout"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "Debug-uitvoer (voor probleemanalyse)"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Versleuteld bericht"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertrouwd Afzenderadres"
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
msgid "Encrypt the message"
msgstr "Het bericht versleutelen"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr "Versleutelt het bericht en alle bijlagen voor verzending"
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
msgid "Sign the message"
msgstr "Het bericht ondertekenen"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr "Het bericht en alle bijlagen ondertekenen voor verzending"
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
msgid "Sign and encrypt the message"
msgstr "Het bericht ondertekenen en versleutelen"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
@@ -132,27 +168,37 @@ msgstr ""
"de ontvangers er zeker van kunnen zijn dat niemand het bericht heeft "
"aangepast en dat alleen de ontvangers het kunnen lezen"
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr "Het instellingen-scherm voor GpgOL openen"
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr "Beveiligen"
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "Ondertekenen"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "Versleutelen"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr "Ontcijferd afdrukken"
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -162,7 +208,7 @@ msgstr ""
"De niet-versleutelde/ondertekende bijlagen zijn:\n"
"\n"
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -172,7 +218,7 @@ msgstr ""
"De niet-ondertekende bijlagen zijn:\n"
"\n"
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -182,7 +228,7 @@ msgstr ""
"De niet-versleutelde bijlagen zijn:\n"
"\n"
-#: src/mail.cpp:374
+#: src/mail.cpp:414
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -190,11 +236,11 @@ msgstr ""
"Let op: De bijlagen zouden op bestands-niveau versleuteld of ondertekend "
"kunnen zijn, maar de GpgOL-status is daarop niet van toepassing."
-#: src/mail.cpp:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr "GpgOL Waarschuwing"
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, c-format
msgid ""
"Crypto operation failed:\n"
@@ -203,11 +249,11 @@ msgstr ""
"Crypto-bewerking mislukt:\n"
"(%s)"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr "Bevestiging van map publieke sleutel"
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -221,31 +267,31 @@ msgstr ""
"Als u niet heeft verzocht om uw publieke sleutel in de map van uw "
"provider te publiceren, negeer dan dit bericht.
\n"
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
msgid "message"
msgstr "bericht"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr "Een moment geduld voordat het bericht is ontcijferd / geverifieerd..."
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr "Weergave van HTML uitgeschakeld."
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr "HTML-inhoud in niet-ondertekende S/MIME e-mail is onveilig."
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr "GpgOL zal dergelijke e-mailberichten alleen als tekst weergeven."
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
msgid "This message is shown only once."
msgstr "Dit bericht wordt eenmalig weergegeven."
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
@@ -253,11 +299,11 @@ msgstr ""
"Vraag de verzender om het bericht te ondertekenen of\n"
" het als platte tekst te versturen."
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oeps, G Suite Sync account gevonden"
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -269,97 +315,97 @@ msgstr ""
"\n"
"Zie: https://dev.gnupg.org/T3545 voor details."
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr "Veiligheidsniveau 4"
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr "Vertrouwensniveau 4"
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr "Veiligheidsniveau 3"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr "Vertrouwensniveau 3"
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr "Veiligheidsniveau 2"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr "Vertrouwensniveau 2"
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
msgid "Encrypted"
msgstr "Versleuteld"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr "Onveilig"
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
msgid "Signed and encrypted message"
msgstr "Ondertekend en versleuteld bericht"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
msgid "Signed message"
msgstr "Ondertekend bericht"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
msgid "Encrypted message"
msgstr "Versleuteld bericht"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
msgid "Insecure message"
msgstr "Onveilig bericht"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
"Het is niet zeker wie het bericht heeft verzonden of onderweg aangepast of "
"gelezen heeft."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr "Het bericht is ondertekend, maar de verificatie is mislukt met:"
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
msgid "The encryption was VS-NfD-compliant."
msgstr "De versleuteling is conform VS-NfD."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
msgid "The encryption was not VS-NfD-compliant."
msgstr "De versleuteling is niet conform VS-NfD."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
"Het is niet zeker wie dit bericht heeft verzonden omdat het niet is "
"ondertekend"
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
msgid "You signed this message."
msgstr "U heeft dit bericht ondertekend."
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr "De identiteit van de verzender is door uzelf gecertificeerd."
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr "De verzender heeft toestemming om identiteiten voor u te certificeren."
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr ""
"De identiteit van de verzender is gecertificeerd door verschillende "
"vertrouwde mensen."
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -369,13 +415,17 @@ msgstr ""
"verlener:\n"
"'%s'\n"
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Enkele vertrouwde personen hebben de identiteit van de verzender "
"gecertificeerd."
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -386,11 +436,11 @@ msgstr ""
"geschiedenis heb opgebouwd met dit adres vanaf %s.\n"
"U heeft sindsdien %i berichten versleuteld en %i berichten geverifieerd."
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr "De handtekening van de verzender is voor het eerst geverifieerd."
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -399,70 +449,70 @@ msgstr ""
"Het adres van de verzender is nog niet betrouwbaar omdat u nog maar %i "
"berichten heeft geverifieerd en %i berichten heeft versleuteld sinds %s."
-#: src/mail.cpp:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr "Maar het adres van de verzender is niet betrouwbaar vanwege:"
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr "Het adres van de verzender is niet betrouwbaar vanwege:"
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
msgid "The signature is invalid: \n"
msgstr "De handtekening is ongeldig:\n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr "Fout bij het verifiëren van de handtekening.\n"
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
msgid "The signature is expired.\n"
msgstr "De handtekening is verlopen.\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr "De gebruikte sleutel"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used certificate"
msgstr "Het gebruikte certificaat"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
msgid "is not available."
msgstr "is niet beschikbaar."
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr "is ingetrokken."
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr "is verlopen."
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr "is niet bedoeld voor ondertekening."
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr "kan niet worden geverifieerd op intrekking."
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
"is niet dezelfde als de sleutel die in het verleden voor dit adres is "
"gebruikt."
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "claimt het adres: \"%s\" niet."
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr "is niet certificeerd door een betrouwbare sleutel."
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -470,56 +520,56 @@ msgstr ""
"is niet gecertificeerd door een betrouwbare certificeringsinstantie of de "
"certificeringsinstantie is onbekend."
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr "De verzender heeft dit adres als ingetrokken gemarkeerd."
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr "is gemarkeerd als onbetrouwbaar."
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
msgid "The signature is VS-NfD-compliant."
msgstr "De handtekening is conform VS-NfD."
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
msgid "The signature is not VS-NfD-compliant."
msgstr "De handtekening is niet conform VS-NfD."
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
msgid "The encryption is VS-NfD-compliant."
msgstr "De versleuteling is conform VS-NfD."
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
msgid "The encryption is not VS-NfD-compliant."
msgstr "De versleuteling is niet conform VS-NfD."
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr "Klik hier om de sleutel voor dit adres te wijzigen."
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr "Klik hier voor details over de sleutel."
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr "Klik hier voor details over het certificaat."
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr "Klik hier om de sleutel op de geconfigureerde keyserver te zoeken."
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"Klik hier om het certificaat op de geconfigureerde X509 keyserver te zoeken."
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Versleutelen niet mogelijk!"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -537,11 +587,11 @@ msgstr ""
"te gebruiken,\n"
"of stap over naar PGP/Inline in de opties van GpgOL."
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr "Sorry, dat is nog niet mogelijk"
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -563,25 +613,25 @@ msgstr ""
"Bijvoorbeeld door met de rechtermuisknop op het bericht te klikken zonder "
"dat deze geselecteerd is.\n"
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr "Gevaarlijke handeling: Beantwoorden"
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr "Gevaarlijke handeling: Doorsturen"
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr "Ongetekende S/MAIL e-mailberichten zijn niet beschermd op integriteit."
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
"Uit veiligheidsoverwegingen wordt er geen ontsleutelde inhoud ingevoegd in "
"dit antwoord."
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
@@ -589,7 +639,7 @@ msgstr ""
"Uit veiligheidsoverwegingen wordt er geen ontsleutelde inhoud ingevoegd in "
"deze doorgestuurde e-mail."
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
msgid ""
"Attachments are part of the crypto message.\n"
"They can't be permanently removed and will be shown again the next time this "
@@ -599,32 +649,19 @@ msgstr ""
"Ze kunnen niet permanent verwijderd worden en zullen de volgende keer dat "
"dit bericht wordt geopend, weer getoond worden."
-#: src/main.c:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "Let op: De volgende compatibiliteits-opties worden gebruikt: %s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[geen onderwerp]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-"[De inhoud van dit bericht is niet zichtbaar door een verwerkingsfout in "
-"GpgOL.]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr "Onbekende sleutel:"
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr "Ontcijferen afgebroken of verlopen."
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
@@ -632,15 +669,15 @@ msgstr ""
"Er kon geen geheime sleutel gevonden worden om het bericht te ontcijferen. "
"Het is versleuteld met de volgende sleutels:"
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr "De gegevens kunnen niet ontcijferd worden: "
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr "Fout bij het verwerken van de e-mail"
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
@@ -648,11 +685,11 @@ msgstr ""
"Gegevens-integriteit is niet beschermd. Ontcijferen kan een "
"beveiligingsprobleem zijn. (geen MDC)"
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
msgid "Encrypted message (decryption not possible)"
msgstr "Versleuteld bericht (ontcijferen niet mogelijk)"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
@@ -660,11 +697,11 @@ msgstr ""
"GnuPG kon niet gevonden worden. Controleer dat GnuPG of Gpg4win correct "
"geïnstalleerd is."
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
msgid "No message selected"
msgstr "Geen bericht geselecteerd"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -675,7 +712,7 @@ msgstr ""
"Er is geen aanvullende informatie beschikbaar over of het daadwerkelijk door "
"'%s' is verzonden of dat iemand het afzender-adres heeft vervalst."
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
@@ -683,9 +720,20 @@ msgstr ""
"Fout bij het verifiëren van de handtekening.\n"
"Volledige details:\n"
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+"Kleopatra kon niet gevonden worden.\n"
+"Installeer Gpg4win opnieuw met het Kleopatra-component ingeschakeld."
+
+#: src/wks-helper.cpp:410
+#, fuzzy, c-format
+msgid ""
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -703,15 +751,15 @@ msgstr ""
"\n"
"Automatisch registreren?"
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr "GpgOL: Map voor publieke sleutels beschikbaar!"
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr "GpgOL: Mapverzoek mislukt"
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
@@ -719,50 +767,69 @@ msgstr ""
"U kun bevestigingsverzoek van uw provider ontvangen\n"
"om de registratie te voltooien."
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr "GpgOL: Verzoek tot registratie verstuurd!"
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr "Registratie bevestigen?"
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr "GpgOL: Bevestiging van map voor publieke sleutels"
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr "GpgOL: Bevestiging mislukt"
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr "Uw publieke sleutel kan spoedig worden opgehaald van uw domein."
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Verzoek bevestigd!"
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
msgid "No recipients for encryption selected."
msgstr "Er zijn geen ontvangers voor de versleuteling geselecteerd."
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
msgid "Resolving recipients..."
msgstr "Ontvangers opzoeken..."
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr "Ondertekenaars opzoeken..."
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
msgid "Encrypting..."
msgstr "Versleutelen..."
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr "Ondertekenen..."
+#~ msgid "Message sending"
+#~ msgstr "Versturen van bericht"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - Bijlage opslaan"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "Debug-uitvoer (voor probleemanalyse)"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "Let op: De volgende compatibiliteits-opties worden gebruikt: %s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr ""
+#~ "[De inhoud van dit bericht is niet zichtbaar door een verwerkingsfout in "
+#~ "GpgOL.]"
+
#~ msgid "Enable simplified interface (experimental)"
#~ msgstr "Vereenvoudigde interface inschakelen (experimenteel)"
diff --git a/po/pt.po b/po/pt.po
index 625f737..e67744a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2018-06-12 14:14+0100\n"
"Last-Translator: aheinecke \n"
"Language-Team: Portuguese \n"
@@ -20,112 +20,148 @@ msgstr ""
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "Geral"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "Ativar o suporte S/MIME"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "Envio de mensagem"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+#, fuzzy
+msgid "Configure GpgOL"
+msgstr "Configurar o GnuPG"
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "Geral"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "Mensagem insegura"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr "Configurar o GnuPG"
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr "Debug..."
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr "Versão "
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr "&Resolver automaticamente as chaves dos destinatários"
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "&Encriptar novas mensagens por omissão"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "Assinar novas mensagens por omissão"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr "Enviar e-mails OpenPGP sem anexos como PGP/Inline"
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
"Selecionar as definições de criptografia automaticamente para responder e "
"encaminhar."
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
-msgstr "&Resolver automaticamente as chaves dos destinatários"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
+msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
-msgstr "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
+msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
-msgstr "Configurar o GnuPG"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
+msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
-msgstr "Versão "
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
+msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
+
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-"Não foi possÃvel encontrar o Kleopatra.\n"
-"Por favor, reinstala o Gpg4win com o componente Kleopatra ativado."
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - Guardar anexo"
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:1073
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
+
+#: src/common.cpp:768
#, fuzzy
msgid "GpgOL Error"
msgstr "GpgOL"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "Debug output (para analisar problemas)"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
msgid "Encrypt the message"
msgstr "Encriptar a mensagem"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr "Encripta a mensagem e todos os anexos antes de enviar"
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
msgid "Sign the message"
msgstr "Assinar a mensagem"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr "Assinar a mensagem e todos os anexos antes de enviar"
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
msgid "Sign and encrypt the message"
msgstr "Assinar e encriptar a mensagem"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
@@ -135,27 +171,37 @@ msgstr ""
"destinatários podem ter a certeza que ninguém modificou a mensagem e apenas "
"os destinatários podem lê-la"
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr "Abrir o diálogo de definições para o GpgOL"
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr "Seguro"
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "Assinar"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "Encriptar"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr "&Imprimir desencriptado"
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -165,7 +211,7 @@ msgstr ""
"Os anexos não-assinados / não-encriptados são:\n"
"\n"
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -175,7 +221,7 @@ msgstr ""
"Os anexos não-assinados são:\n"
"\n"
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -185,7 +231,7 @@ msgstr ""
"Os anexos não-encriptados são:\n"
"\n"
-#: src/mail.cpp:374
+#: src/mail.cpp:414
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -193,11 +239,11 @@ 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:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr "Aviso do GpgOL"
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, fuzzy, c-format
msgid ""
"Crypto operation failed:\n"
@@ -206,11 +252,11 @@ msgstr ""
"A desencriptação falhou\n"
"(%s)"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr "Confirmação de diretoria Pubkey"
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -224,34 +270,34 @@ msgstr ""
"Se não pediste para publicar a tua Pubkey na diretoria do teu provedor, "
"simplesmente ignora esta mensagem.
\n"
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
#, fuzzy
msgid "message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
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:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr "Mostrar HTML desativado."
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr "O conteúdo HTML em e-mails S/MIME não assinados é inseguro."
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr "O GpgOL apenas mostrará esses e-mails como texto."
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
msgid "This message is shown only once."
msgstr "Esta mensagem é apenas mostrada uma vez."
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
@@ -259,11 +305,11 @@ msgstr ""
"Por favor, pede ao remetente para assinar a mensagem ou\n"
"para enviá-la com a alternativa de texto simples."
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, conta G Suite Sync detetada"
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -275,95 +321,95 @@ msgstr ""
"\n"
"Vê: https://dev.gnupg.org/T3545 para detalhes."
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr "NÃvel de segurança 4"
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr "NÃvel de Confiança 4"
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr "NÃvel de Segurança 3"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr "NÃvel de Confiança 3"
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr "NÃvel de Segurança 2"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr "NÃvel de Confiança 2"
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
msgid "Encrypted message"
msgstr "Mensagem encriptada"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
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:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr "A mensagem foi assinada, mas a verificação falhou com:"
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
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:2315
+#: src/mail.cpp:2450
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
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:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -372,11 +418,15 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -387,11 +437,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -400,68 +450,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:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
msgid "is not available."
msgstr "não está disponÃvel."
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
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:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -469,57 +519,57 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
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:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
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:2535
+#: src/mail.cpp:2678
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:2859
+#: src/mail.cpp:3000
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Encriptação não possÃvel!"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -535,11 +585,11 @@ msgstr ""
"Se continuar a falhar, considera usar um anexo encriptado ou\n"
"alternar para PGP/Inline nas opções do GpgOL."
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr "Desculpa, isso não é possÃvel, ainda"
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -561,25 +611,25 @@ msgstr ""
"Por exemplo, ao clicar com o botão direito do rato, mas não selecionar a "
"mensagem.\n"
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr "Resposta perigosa"
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr "Encaminhamento perigoso"
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr "Os e-mails S/MIME não assinados não têm a integridade protegida."
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
"Por razões de segurança, os conteúdos desencriptados não são incluÃdos nesta "
"resposta."
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
@@ -587,39 +637,26 @@ msgstr ""
"Por razões de segurança, os conteúdos desencriptados não são incluÃdos no e-"
"mail encaminhado."
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
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:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "Nota: A usar sinalizadores de compatibilidade: %s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[sem assunto]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-"[O conteúdo desta mensagem não é visÃvel devido a um erro de processamento "
-"no GpgOL.]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr "Chave Desconhecida:"
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr "Desencriptação cancelada ou o tempo esgotou."
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
@@ -627,15 +664,15 @@ msgstr ""
"Nenhuma chave secreta encontrada para desencriptar a mensagem. Está "
"encriptada para as seguintes chaves:"
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr "Não foi possÃvel desencriptar os dados: "
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr "Falha ao analisar o e-mail."
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
@@ -643,11 +680,11 @@ msgstr ""
"Os dados não têm a integridade protegida. Desencriptar poderá ser um "
"problema de segurança. (sem MDC)"
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
msgid "Encrypted message (decryption not possible)"
msgstr "Mensagem encriptada (desencriptação não possÃvel)"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
@@ -655,11 +692,11 @@ msgstr ""
"Falha ao localizar o GnuPG, por favor certifica-te que o GnuPG ou o Gpg4win "
"está corretamente instalado."
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
msgid "No message selected"
msgstr "Nenhuma mensagem selecionada"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -670,16 +707,27 @@ msgstr ""
"Não há nenhuma informação adicional disponÃvel se ela realmente foi enviada "
"por '%s' ou se alguém falsificou o endereço do remetente."
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
#, fuzzy
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
+msgid ""
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+"Não foi possÃvel encontrar o Kleopatra.\n"
+"Por favor, reinstala o Gpg4win com o componente Kleopatra ativado."
+
+#: src/wks-helper.cpp:410
+#, fuzzy, c-format
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -697,15 +745,15 @@ msgstr ""
"\n"
"Registar automaticamente?"
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr "GpgOL: Diretoria de Pubkey disponÃvel!"
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr "GpgOL: Pedido de diretoria falhou"
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
@@ -713,51 +761,70 @@ msgstr ""
"Poderás receber um desafio de confirmação do\n"
"teu provedor para concluir o registo."
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr "GpgOL: Pedido de registo enviado!"
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr "Confirmar o registo?"
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr "GpgOL: Confirmação da diretoria de Pubkey"
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr "GpgOL: Confirmação falhou"
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr "A tua Pubkey pode ser brevemente recuperada do teu domÃnio."
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Pedido confirmado!"
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
#, fuzzy
msgid "No recipients for encryption selected."
msgstr "Não foram selecionados destinatários para a encriptação"
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
msgid "Resolving recipients..."
msgstr "A resolver destinatários..."
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr "A resolver assinantes..."
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
msgid "Encrypting..."
msgstr "A encriptar..."
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr "A assinar..."
+#~ msgid "Message sending"
+#~ msgstr "Envio de mensagem"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - Guardar anexo"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "Debug output (para analisar problemas)"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "Nota: A usar sinalizadores de compatibilidade: %s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr ""
+#~ "[O conteúdo desta mensagem não é visÃvel devido a um erro de "
+#~ "processamento no GpgOL.]"
+
#~ msgid "Enable simplified interface (experimental)"
#~ msgstr "Ativar a interface simplificada (experimental)"
diff --git a/po/sv.po b/po/sv.po
index 8ac2805..7c4aecc 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@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander \n"
"Language-Team: Swedish \n"
@@ -16,184 +16,230 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/addin-options.cpp:41
-msgid "General"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr ""
-#: src/addin-options.cpp:44
-msgid "Message sending"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+msgid "Configure GpgOL"
+msgstr ""
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
msgstr ""
#: src/addin-options.cpp:45
#, fuzzy
-msgid "&Encrypt new messages by default"
-msgstr "Kryptera meddelandet med GPG"
+msgid "Automatically secure &messages"
+msgstr "Dekryptera och validera meddelandet."
#: src/addin-options.cpp:46
-msgid "&Sign new messages by default"
+msgid "Configure GnuPG"
msgstr ""
#: src/addin-options.cpp:47
-msgid "&Send OpenPGP mails without attachments as PGP/Inline"
+msgid "Debug..."
+msgstr ""
+
+#: src/addin-options.cpp:48
+msgid "Version "
msgstr ""
#: src/addin-options.cpp:49
-msgid "S&elect crypto settings automatically for reply and forward"
+msgid "&Resolve recipient keys automatically"
msgstr ""
+#: src/addin-options.cpp:50
+#, fuzzy
+msgid "&Encrypt new messages by default"
+msgstr "Kryptera meddelandet med GPG"
+
#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
+msgid "&Sign new messages by default"
msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
+#: src/addin-options.cpp:52
+msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
+#: src/addin-options.cpp:54
+msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
#: src/addin-options.cpp:56
-msgid "Version "
+msgid "&Prefer S/MIME when automatically resolving recipients"
+msgstr ""
+
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
+msgstr ""
+
+#: src/addin-options.cpp:61
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
msgstr ""
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
+#: src/addin-options.cpp:62
+msgid "experimental"
msgstr ""
-#: src/common.c:239
-#, fuzzy
-msgid "GpgOL - Save attachment"
-msgstr "GPG - Spara dekrypterad bilaga"
+#: src/addin-options.cpp:63
+msgid ""
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
+msgstr ""
+
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
+
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
-#: src/common.c:1073
+#: src/common.cpp:768
#, fuzzy
msgid "GpgOL Error"
msgstr "In-/Ut-fel"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr ""
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr ""
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
#, fuzzy
msgid "Encrypt the message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
#, fuzzy
msgid "Sign the message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
#, fuzzy
msgid "Sign and encrypt the message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
"read it"
msgstr ""
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr ""
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr ""
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr ""
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr ""
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
#, fuzzy
msgid "Encrypt"
msgstr "Kryptering"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr ""
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:374
+#: src/mail.cpp:414
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:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, fuzzy, c-format
msgid ""
"Crypto operation failed:\n"
"%s"
msgstr "Kryptering misslyckades"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -202,43 +248,43 @@ msgid ""
"directory, simply ignore this message.
\n"
msgstr ""
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
#, fuzzy
msgid "message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr ""
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr ""
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
#, fuzzy
msgid "This message is shown only once."
msgstr "Dekryptera meddelandet och validera signaturen"
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
msgstr ""
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -246,110 +292,114 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -357,142 +407,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, 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:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -502,11 +552,11 @@ msgid ""
"switching to PGP/Inline in GpgOL's options."
msgstr ""
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -518,93 +568,82 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr ""
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr ""
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr ""
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
msgstr ""
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
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:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr ""
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr ""
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr ""
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr ""
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
msgstr ""
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr ""
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr ""
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
msgstr ""
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
msgid "Encrypted message (decryption not possible)"
msgstr ""
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
msgstr ""
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
msgid "No message selected"
msgstr ""
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -612,15 +651,24 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
msgstr ""
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+
+#: src/wks-helper.cpp:410
+#, c-format
+msgid ""
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -630,66 +678,70 @@ msgid ""
"Register automatically?"
msgstr ""
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr ""
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr ""
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
msgstr ""
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr ""
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr ""
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr ""
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr ""
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr ""
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
msgid "No recipients for encryption selected."
msgstr ""
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
msgid "Resolving recipients..."
msgstr ""
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
#, fuzzy
msgid "Encrypting..."
msgstr "Kryptering"
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr ""
#, fuzzy
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GPG - Spara dekrypterad bilaga"
+
+#, fuzzy
#~ msgid "Decrypt"
#~ msgstr "Dekryptering"
diff --git a/po/uk.po b/po/uk.po
index 374f9c5..3646503 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2018-06-12 19:38+0200\n"
"Last-Translator: Yuri Chornoivan \n"
"Language-Team: Ukrainian \n"
@@ -19,110 +19,145 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "ÐагалÑне"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "УвÑмкнÑÑи пÑдÑÑÐ¸Ð¼ÐºÑ S/MIME"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑдомленнÑ"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+#, fuzzy
+msgid "Configure GpgOL"
+msgstr "ÐалаÑÑÑваÑи GnuPG"
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "ÐагалÑне"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "ÐезаÑ
иÑене повÑдомленнÑ"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr "ÐалаÑÑÑваÑи GnuPG"
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr "ÐÑагноÑÑикаâ¦"
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr "ÐеÑÑÑÑ "
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr "ÐвÑомаÑиÑно ви&знаÑаÑи клÑÑÑ Ð¾ÑÑимÑваÑÑв"
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "Типово &ÑиÑÑÑваÑи Ð½Ð¾Ð²Ñ Ð¿Ð¾Ð²ÑдомленнÑ"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "Ð¢Ð¸Ð¿Ð¾Ð²Ñ &пÑдпиÑÑваÑи Ð½Ð¾Ð²Ñ Ð¿Ð¾Ð²ÑдомленнÑ"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr "&ÐадÑилаÑи повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ OpenPGP без долÑÑÐµÐ½Ñ Ñк PGP/Inline"
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr "ÐвÑомаÑиÑно ви&бÑаÑи паÑамеÑÑи кÑипÑогÑаÑÑÑ Ð´Ð»Ñ Ð²ÑдповÑÐ´Ñ Ñ Ð¿ÐµÑеÑлаÑи"
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
-msgstr "ÐвÑомаÑиÑно ви&знаÑаÑи клÑÑÑ Ð¾ÑÑимÑваÑÑв"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
+msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
-msgstr "ÐÑагноÑÑикаâ¦"
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
+msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
-msgstr "ÐалаÑÑÑваÑи GnuPG"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
+msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
-msgstr "ÐеÑÑÑÑ "
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
+msgstr ""
+
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-"Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñи Kleopatra.\n"
-"ÐÑÐ´Ñ Ð»Ð°Ñка, повÑоÑно вÑÑановÑÑÑ Gpg4win, ÑвÑмкнÑвÑи вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа "
-"Kleopatra."
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL â збеÑÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð»ÑÑеннÑ"
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:1073
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
+
+#: src/common.cpp:768
msgid "GpgOL Error"
msgstr "Ðомилка GpgOL"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "ÐÑагноÑÑиÑÐ½Ñ Ð´Ð°Ð½Ñ (Ð´Ð»Ñ Ð°Ð½Ð°Ð»ÑÐ·Ñ Ð¿Ñоблем)"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: заÑиÑÑоване повÑдомленнÑ"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: довÑÑена адÑеÑа вÑдпÑавника"
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
msgid "Encrypt the message"
msgstr "ÐаÑиÑÑÑваÑи повÑдомленнÑ"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr "ÐаÑиÑÑÑваÑи повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ ÑÑÑ Ð´Ð¾Ð»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ нÑого до надÑиланнÑ"
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
msgid "Sign the message"
msgstr "ÐÑдпиÑаÑи повÑдомленнÑ"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr "ÐÑдпиÑаÑи повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ ÑÑÑ Ð´Ð¾Ð»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ нÑого до надÑиланнÑ"
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
msgid "Sign and encrypt the message"
msgstr "ÐÑдпиÑаÑи Ñ Ð·Ð°ÑиÑÑÑваÑи повÑдомленнÑ"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
@@ -132,27 +167,37 @@ msgstr ""
"оÑÑимÑваÑÑ Ð·Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑи певнÑ, Ñо нÑÑ
Ñо не вноÑив змÑн до повÑдомленнÑ. ÐиÑе "
"Ð²ÐºÐ°Ð·Ð°Ð½Ñ Ð²Ð°Ð¼Ð¸ оÑÑимÑваÑÑ Ð·Ð¼Ð¾Ð¶ÑÑÑ Ð¿ÑоÑиÑаÑи надÑÑлане повÑдомленнÑ."
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr "ÐÑдкÑиÑи дÑалогове вÑкно паÑамеÑÑÑв GpgOL"
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr "ÐезпеÑне"
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "ÐÑдпиÑаÑи"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "ÐаÑиÑÑÑваÑи"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr "&ÐадÑÑкÑваÑи ÑозÑиÑÑоване"
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
@@ -162,7 +207,7 @@ msgstr ""
"ÐепÑдпиÑаними або незаÑиÑÑованими долÑÑеннÑми Ñ ÑакÑ:\n"
"\n"
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
@@ -172,7 +217,7 @@ msgstr ""
"ÐепÑдпиÑаними долÑÑеннÑми Ñ ÑакÑ:\n"
"\n"
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
@@ -182,7 +227,7 @@ msgstr ""
"ÐезаÑиÑÑованими долÑÑеннÑми Ñ ÑакÑ:\n"
"\n"
-#: src/mail.cpp:374
+#: src/mail.cpp:414
msgid ""
"Note: The attachments may be encrypted or signed on a file level but the "
"GpgOL status does not apply to them."
@@ -190,11 +235,11 @@ msgstr ""
"ÐаÑваженнÑ: долÑÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ðµ бÑÑи заÑиÑÑовано або пÑдпиÑано на ÑÑÐ²Ð½Ñ ÑайлÑв, "
"але Ñе не ÑÑоÑÑÑÑÑÑÑ ÑÑÐ°Ð½Ñ Ñ GpgOL."
-#: src/mail.cpp:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr "ÐопеÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ GpgOL"
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, c-format
msgid ""
"Crypto operation failed:\n"
@@ -203,11 +248,11 @@ msgstr ""
"Ðомилка кÑипÑогÑаÑÑÑÐ½Ð¾Ñ Ð´ÑÑ:\n"
"%s"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr "ÐÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð²ÑдкÑиÑиÑ
клÑÑÑв"
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -221,32 +266,32 @@ msgstr ""
"ЯкÑо ви не надÑилали запиÑÑ Ñодо опÑилÑÐ´Ð½ÐµÐ½Ð½Ñ Ð²Ð°Ñого вÑдкÑиÑого клÑÑа Ñ "
"каÑÐ°Ð»Ð¾Ð·Ñ Ð²Ð°Ñого надаваÑа поÑлÑг, пÑоÑÑо пÑоÑгноÑÑйÑе Ñе повÑдомленнÑ.
\n"
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
msgid "message"
msgstr "повÑдомленнÑ"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
"ÐÑÐ´Ñ Ð»Ð°Ñка, заÑекайÑе, доки повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ñде ÑозÑиÑÑовано або пеÑевÑÑеноâ¦"
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr "Ðоказ HTML вимкнено."
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr "Ðоказ даниÑ
HTML Ñ Ð½ÐµÐ¿ÑдпиÑаниÑ
повÑдомленнÑÑ
S/MIME не Ñ Ð±ÐµÐ·Ð¿ÐµÑним."
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr "GpgOL показÑваÑиме лиÑе ÑекÑÑ Ð· ÑакиÑ
повÑдомленÑ."
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
msgid "This message is shown only once."
msgstr "Це повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ñде показано лиÑе один Ñаз."
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
@@ -254,11 +299,11 @@ msgstr ""
"ÐÑÐ´Ñ Ð»Ð°Ñка, попÑоÑÑÑÑ Ð²ÑдпÑавника пÑдпиÑаÑи повÑдомленнÑ\n"
"або надÑÑлаÑи його Ñ ÑоÑмаÑÑ Ð¿ÑоÑÑого ÑекÑÑÑ."
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: оÑе ÑобÑ, виÑвлено облÑковий Ð·Ð°Ð¿Ð¸Ñ G Suite Sync"
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -271,95 +316,95 @@ msgstr ""
"\n"
"ÐокладнÑÑе пÑо Ñе ÑÑÑ: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ 4"
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð½Ð°Ð´ÑйноÑÑÑ 4"
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ 3"
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð½Ð°Ð´ÑйноÑÑÑ 3"
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ 2"
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr "Ð ÑÐ²ÐµÐ½Ñ Ð½Ð°Ð´ÑйноÑÑÑ 2"
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
msgid "Encrypted"
msgstr "ÐаÑиÑÑовано"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr "ÐезаÑ
иÑена"
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
msgid "Signed and encrypted message"
msgstr "ÐÑдпиÑане Ñ Ð·Ð°ÑиÑÑоване повÑдомленнÑ"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
msgid "Signed message"
msgstr "ÐÑдпиÑане повÑдомленнÑ"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
msgid "Encrypted message"
msgstr "ÐаÑиÑÑоване повÑдомленнÑ"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
msgid "Insecure message"
msgstr "ÐезаÑ
иÑене повÑдомленнÑ"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
"Ðи не можеÑе бÑÑи Ð¿ÐµÐ²Ð½Ñ Ñодо Ñого, Ñ
Ñо надÑÑлав, змÑнив Ñи ÑиÑав "
"повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñд ÑÐ°Ñ Ð¿ÐµÑеÑиланнÑ."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr "ÐовÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ñло пÑдпиÑано, але воно не пÑойÑло пеÑевÑÑкÑ:"
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
msgid "The encryption was VS-NfD-compliant."
msgstr "ШиÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÑмÑÑне Ñз VS-NfD."
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
msgid "The encryption was not VS-NfD-compliant."
msgstr "ШиÑÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ðµ ÑÑмÑÑне Ñз VS-NfD."
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
"Ðи не можеÑе бÑÑи Ð¿ÐµÐ²Ð½Ñ Ñого, Ñ
Ñо надÑÑлав Ñе повÑдомленнÑ, оÑкÑлÑки його не "
"пÑдпиÑано."
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
msgid "You signed this message."
msgstr "Ðи пÑдпиÑали Ñе повÑдомленнÑ."
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr "ÐÑоÑÑÐ»Ñ Ð²ÑдпÑавника ÑеÑÑиÑÑковано вами."
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr "ÐÑдпÑÐ°Ð²Ð½Ð¸ÐºÑ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ ÑеÑÑиÑÑкÑваÑи пÑоÑÑÐ»Ñ Ð´Ð»Ñ Ð²Ð°Ñ."
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr "ÐÑоÑÑÐ»Ñ Ð²ÑдпÑавника ÑеÑÑиÑÑковано декÑлÑкома довÑÑеними оÑобами."
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -368,11 +413,15 @@ msgstr ""
"ÐÑоÑÑÐ»Ñ Ð²ÑдпÑавника ÑеÑÑиÑÑковано довÑÑеним видавÑем ÑеÑÑиÑÑкаÑÑв:\n"
"«%s»\n"
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr "ÐÑоÑÑÐ»Ñ Ð²ÑдпÑавника ÑеÑÑиÑÑковано декÑлÑкома довÑÑеними оÑобами."
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -383,11 +432,11 @@ msgstr ""
"ÑпÑлкÑÐ²Ð°Ð½Ð½Ñ Ð· Ñим, поÑинаÑÑи з %s.\n"
"Ð Ñого ÑаÑÑ Ð±Ñло заÑиÑÑовано %i Ñ Ð¿ÐµÑевÑÑено %i повÑдомленÑ."
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr "ÐÑÐ´Ð¿Ð¸Ñ Ð²ÑдпÑавника пеÑевÑÑено ÑпеÑÑе."
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -396,69 +445,69 @@ msgstr ""
"ÐдÑеÑа вÑдпÑавника не Ñ Ñе гÑÐ´Ð½Ð¾Ñ Ð´Ð¾Ð²ÑÑи, оÑкÑлÑки вами пеÑевÑÑено %i "
"повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ñз заÑиÑÑовано %i повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð¾ нÑого з %s."
-#: src/mail.cpp:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr "Ðле адÑеÑа вÑдпÑавника не Ñ Ð³ÑÐ´Ð½Ð¾Ñ Ð´Ð¾Ð²ÑÑи, оÑкÑлÑки:"
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr "ÐдÑеÑа вÑдпÑавника не Ñ Ð³ÑÐ´Ð½Ð¾Ñ Ð´Ð¾Ð²ÑÑи, оÑкÑлÑки:"
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
msgid "The signature is invalid: \n"
msgstr "ÐÑÐ´Ð¿Ð¸Ñ Ñ Ð½ÐµÐºÐ¾ÑекÑним: \n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr "ÐÑд ÑÐ°Ñ ÑпÑоби пеÑевÑÑиÑи пÑÐ´Ð¿Ð¸Ñ ÑÑалаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°.\n"
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
msgid "The signature is expired.\n"
msgstr "СÑÑок дÑÑ Ð¿ÑдпиÑÑ Ð²Ð¸ÑеÑпано.\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr "ÐикоÑиÑÑаний клÑÑ"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used certificate"
msgstr "ÐикоÑиÑÑаний ÑеÑÑиÑÑкаÑ"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
msgid "is not available."
msgstr "Ñ Ð½ÐµÐ´Ð¾ÑÑÑпним."
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr "вÑдкликано."
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr ", ÑÑÑок дÑÑ Ð²Ð¸ÑеÑпано."
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr "не пÑизнаÑено Ð´Ð»Ñ Ð¿ÑдпиÑÑваннÑ."
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr "не може бÑÑи пеÑевÑÑено на вÑдкликаннÑ."
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
"не Ñ Ñим Ñамим, Ñо Ñ ÐºÐ»ÑÑ, Ñкий викоÑиÑÑовÑвавÑÑ Ð´Ð»Ñ ÑÑÑÑ Ð°Ð´ÑеÑи Ñ Ð¼Ð¸Ð½ÑломÑ."
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "не вÑдповÑÐ´Ð°Ñ Ð°Ð´ÑеÑÑ: «%s»."
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr "не Ñ ÑеÑÑиÑÑкованим бÑдÑ-Ñким гÑдним довÑÑи клÑÑем."
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -466,56 +515,56 @@ msgstr ""
"не поÑвÑдÑено гÑÐ´Ð½Ð¾Ñ Ð´Ð¾Ð²ÑÑи ÑлÑÐ¶Ð±Ð¾Ñ ÑеÑÑиÑÑкаÑÑÑ Ð°Ð±Ð¾ ÑлÑжба ÑеÑÑиÑÑкаÑÑÑ Ñ "
"невÑдомоÑ."
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr "ÐÑдпÑавником познаÑено ÑÑ Ð°Ð´ÑеÑÑ Ñк вÑдкликанÑ."
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr "познаÑено Ñк не гÑÐ´Ð½Ñ Ð´Ð¾Ð²ÑÑи."
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
msgid "The signature is VS-NfD-compliant."
msgstr "ÐÑÐ´Ð¿Ð¸Ñ Ñ ÑÑмÑÑним Ñз VS-NfD."
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
msgid "The signature is not VS-NfD-compliant."
msgstr "ÐÑÐ´Ð¿Ð¸Ñ Ð½Ðµ Ñ ÑÑмÑÑним Ñз VS-NfD."
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
msgid "The encryption is VS-NfD-compliant."
msgstr "ШиÑÑÑÐ²Ð°Ð½Ð½Ñ Ñ ÑÑмÑÑним Ñз VS-NfD."
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
msgid "The encryption is not VS-NfD-compliant."
msgstr "ШиÑÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ðµ ÑÑмÑÑне Ñз VS-NfD."
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr "ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб змÑниÑи клÑÑ, Ñкий викоÑиÑÑано Ð´Ð»Ñ ÑÑÑÑ Ð°Ð´ÑеÑи."
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr "ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб дÑзнаÑиÑÑ Ð±ÑлÑÑе пÑо клÑÑ."
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr "ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб дÑзнаÑиÑÑ Ð±ÑлÑÑе пÑо ÑеÑÑиÑÑкаÑ."
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr "ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб поÑÑкаÑи клÑÑ Ð½Ð° налаÑÑÐ¾Ð²Ð°Ð½Ð¾Ð¼Ñ ÑеÑвеÑÑ ÐºÐ»ÑÑÑв."
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
"ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб поÑÑкаÑи ÑеÑÑиÑÑÐºÐ°Ñ Ð½Ð° налаÑÑÐ¾Ð²Ð°Ð½Ð¾Ð¼Ñ ÑеÑвеÑÑ ÐºÐ»ÑÑÑв X509."
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: ÑиÑÑÑÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ!"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -533,11 +582,11 @@ msgstr ""
"заÑиÑÑованим\n"
"долÑÑеннÑм даниÑ
або пеÑемкнÑÑÑÑÑ Ð½Ð° PGP/Inline Ñ Ð¿Ð°ÑамеÑÑаÑ
GpgOL."
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr "ÐибаÑÑе, Ñе Ñе неможливо"
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -558,24 +607,24 @@ msgstr ""
"ÐапÑиклад, можна клаÑнÑÑи пÑÐ°Ð²Ð¾Ñ ÐºÐ½Ð¾Ð¿ÐºÐ¾Ñ Ð¼Ð¸ÑÑ Ð½Ð° повÑдомленнÑ, не познаÑаÑÑи "
"його.\n"
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr "ÐебезпеÑна вÑдповÑдÑ"
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr "ÐебезпеÑне пеÑеÑпÑÑмовÑваннÑ"
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr "ЦÑлÑÑнÑÑÑÑ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ S/MIME без пÑдпиÑÑ Ð½Ðµ заÑ
иÑено."
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
"РмÑÑкÑÐ²Ð°Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, до ÑÑÑÑ Ð²ÑдповÑÐ´Ñ Ð½Ðµ вклÑÑено ÑозÑиÑÑованиÑ
даниÑ
."
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
@@ -583,7 +632,7 @@ msgstr ""
"РмÑÑкÑÐ²Ð°Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, до ÑÑого пеÑеÑпÑÑмованого повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вклÑÑено "
"ÑозÑиÑÑованиÑ
даниÑ
."
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
msgid ""
"Attachments are part of the crypto message.\n"
"They can't be permanently removed and will be shown again the next time this "
@@ -593,33 +642,20 @@ msgstr ""
"ÐÑ
не можна оÑÑаÑоÑно вилÑÑиÑи â ÑÑ
Ð·Ð½Ð¾Ð²Ñ Ð±Ñде показано пÑд ÑÐ°Ñ Ð½Ð°ÑÑÑпного "
"вÑдкÑиÑÑÑ Ð¿Ð¾Ð²ÑдомленнÑ."
-#: src/main.c:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "ÐаÑваженнÑ: викоÑиÑÑовÑÑмо пÑапоÑÑÑ ÑÑмÑÑноÑÑÑ: %s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[без Ñеми]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr ""
-"[ÐмÑÑÑ ÑÑого повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ показано, оÑкÑлÑки пÑд ÑÐ°Ñ Ð¹Ð¾Ð³Ð¾ обÑобки Ñ GpgOL "
-"ÑÑалаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°.]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr "ÐевÑдомий клÑÑ:"
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr ""
"РозÑиÑÑовÑÐ²Ð°Ð½Ð½Ñ ÑкаÑовано або пеÑевиÑено ÑÐ°Ñ Ð¾ÑÑкÑÐ²Ð°Ð½Ð½Ñ Ð½Ð° ÑозÑиÑÑовÑваннÑ."
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
@@ -627,15 +663,15 @@ msgstr ""
"Ðе знайдено закÑиÑого клÑÑа Ð´Ð»Ñ ÑозÑиÑÑовÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑдомленнÑ. ÐовÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ "
"заÑиÑÑовано Ð´Ð»Ñ ÑакиÑ
клÑÑÑв:"
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr "Ðе вдалоÑÑ ÑозÑиÑÑÑваÑи данÑ: "
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr "Ðе вдалоÑÑ Ð¾Ð±ÑобиÑи повÑдомленнÑ."
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
@@ -643,11 +679,11 @@ msgstr ""
"ЦÑлÑÑнÑÑÑÑ Ð´Ð°Ð½Ð¸Ñ
не заÑ
иÑено. РозÑиÑÑовÑÐ²Ð°Ð½Ð½Ñ ÑиÑ
даниÑ
може ÑÑановиÑи "
"загÑÐ¾Ð·Ñ Ð±ÐµÐ·Ð¿ÐµÑÑ ÑиÑÑеми. (Ð½ÐµÐ¼Ð°Ñ MDC)"
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
msgid "Encrypted message (decryption not possible)"
msgstr "ÐаÑиÑÑоване повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ (ÑозÑиÑÑÑÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ)"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
@@ -655,11 +691,11 @@ msgstr ""
"Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñи GnuPG. ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑеконайÑеÑÑ, Ñо GnuPG або Gpg4win "
"вÑÑановлено належним Ñином."
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
msgid "No message selected"
msgstr "Ðе познаÑено жодного повÑдомленнÑ"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -670,7 +706,7 @@ msgstr ""
"ÐÐµÐ¼Ð°Ñ Ð½ÑÑкиÑ
додаÑковиÑ
даниÑ
, ÑÐºÑ Ð¿ÑдÑвеÑджÑвали б його надÑÐ¸Ð»Ð°Ð½Ð½Ñ Â«%s». "
"Ðожливо, Ñ
ÑоÑÑ ÑÑалÑÑÑвав адÑеÑÑ Ð²ÑдпÑавника."
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
@@ -678,9 +714,21 @@ msgstr ""
"ÐÑд ÑÐ°Ñ ÑпÑоби пеÑевÑÑиÑи пÑÐ´Ð¿Ð¸Ñ ÑÑалаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°.\n"
"ÐодÑобиÑÑ:\n"
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+"Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñи Kleopatra.\n"
+"ÐÑÐ´Ñ Ð»Ð°Ñка, повÑоÑно вÑÑановÑÑÑ Gpg4win, ÑвÑмкнÑвÑи вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа "
+"Kleopatra."
+
+#: src/wks-helper.cpp:410
+#, fuzzy, c-format
+msgid ""
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -699,15 +747,15 @@ msgstr ""
"\n"
"ÐаÑеÑÑÑÑÑваÑиÑÑ Ð°Ð²ÑомаÑиÑно?"
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr "GpgOL: доÑÑÑпний каÑалог вÑдкÑиÑиÑ
клÑÑÑв!"
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr "GpgOL: помилка пÑд ÑÐ°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ñодо каÑалогÑ"
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
@@ -715,46 +763,65 @@ msgstr ""
"ÐмовÑÑно, ви оÑÑимаÑÑе пÑоÑ
Ð°Ð½Ð½Ñ Ñодо пÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð²Ñд\n"
"ваÑого надаваÑа поÑлÑг Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑеÑÑÑÑаÑÑÑ."
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr "GpgOL: надÑÑлано Ð·Ð°Ð¿Ð¸Ñ Ñодо ÑеÑÑÑÑаÑÑÑ!"
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr "ÐÑдÑвеÑдиÑи ÑеÑÑÑÑаÑÑÑ?"
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr "GpgOL: пÑдÑвеÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Ð²ÑдкÑиÑиÑ
клÑÑÑв"
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr "GpgOL: помилка пÑд ÑÐ°Ñ ÑпÑоби пÑдÑвеÑдженнÑ"
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr "ÐÐµÐ²Ð´Ð¾Ð²Ð·Ñ Ð²Ð°Ñ Ð²ÑдкÑиÑий клÑÑ Ð¼Ð¾Ð¶Ð½Ð° бÑде оÑÑимаÑи з ваÑого доменÑ."
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Ð·Ð°Ð¿Ð¸Ñ Ð¿ÑдÑвеÑджено!"
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
msgid "No recipients for encryption selected."
msgstr "Ðе вибÑано жодного оÑÑимÑваÑа Ð´Ð»Ñ ÑиÑÑÑваннÑ."
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
msgid "Resolving recipients..."
msgstr "ÐизнаÑаÑмо оÑÑимÑваÑÑвâ¦"
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr "ÐизнаÑаÑмо пÑдпиÑникÑвâ¦"
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
msgid "Encrypting..."
msgstr "ÐаÑиÑÑовÑÑмоâ¦"
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr "ÐÑдпиÑÑÑмоâ¦"
+
+#~ msgid "Message sending"
+#~ msgstr "ÐадÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑдомленнÑ"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL â збеÑÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð»ÑÑеннÑ"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "ÐÑагноÑÑиÑÐ½Ñ Ð´Ð°Ð½Ñ (Ð´Ð»Ñ Ð°Ð½Ð°Ð»ÑÐ·Ñ Ð¿Ñоблем)"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "ÐаÑваженнÑ: викоÑиÑÑовÑÑмо пÑапоÑÑÑ ÑÑмÑÑноÑÑÑ: %s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr ""
+#~ "[ÐмÑÑÑ ÑÑого повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ показано, оÑкÑлÑки пÑд ÑÐ°Ñ Ð¹Ð¾Ð³Ð¾ обÑобки Ñ "
+#~ "GpgOL ÑÑалаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°.]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8419cc5..17d20fd 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@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) \n"
"Language-Team: \n"
@@ -18,170 +18,217 @@ msgstr ""
"X-Generator: Poedit 1.8.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "éç¨"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "å¯ç¨ S/MIME æ¯æ"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "æ¶æ¯åéä¸"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+msgid "Configure GpgOL"
+msgstr ""
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "éç¨"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "è§£å¯æ¶æ¯"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr ""
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr ""
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr ""
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr ""
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "é»è®¤å 坿°æ¶æ¯ï¼&Eï¼"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "é»è®¤ç¾åæ°æ¶æ¯ï¼&Sï¼"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr ""
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
+
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - ä¿åéä»¶"
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
-#: src/common.c:1073
+#: src/common.cpp:768
#, fuzzy
msgid "GpgOL Error"
msgstr "GpgOL"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "è°è¯è¾åºï¼ç¨æ¥åæé®é¢ï¼"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "è§£å¯æ¶æ¯"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr ""
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
#, fuzzy
msgid "Encrypt the message"
msgstr "è§£å¯æ¶æ¯"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
#, fuzzy
msgid "Sign the message"
msgstr "è§£å¯æ¶æ¯"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
#, fuzzy
msgid "Sign and encrypt the message"
msgstr "è§£å¯æ¶æ¯"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
"read it"
msgstr ""
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr ""
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr ""
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "ç¾å"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "å å¯"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr ""
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:374
+#: src/mail.cpp:414
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:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, fuzzy, c-format
msgid ""
"Crypto operation failed:\n"
@@ -190,11 +237,11 @@ msgstr ""
"è§£å¯å¤±è´¥\n"
"ï¼%sï¼"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -203,43 +250,43 @@ msgid ""
"directory, simply ignore this message.\n"
msgstr ""
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
#, fuzzy
msgid "message"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr ""
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr ""
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
#, fuzzy
msgid "This message is shown only once."
msgstr "æ¤æ¶æ¯æªè¢«å å¯ã"
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
msgstr ""
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -247,110 +294,114 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
#, fuzzy
msgid "Encrypted"
msgstr "å å¯"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
#, fuzzy
msgid "Signed and encrypted message"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
#, fuzzy
msgid "Signed message"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
#, fuzzy
msgid "Encrypted message"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
#, fuzzy
msgid "Insecure message"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
#, fuzzy
msgid "You signed this message."
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -358,142 +409,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, 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:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
#, fuzzy
msgid "The signature is expired.\n"
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
#, fuzzy
msgid "The used certificate"
msgstr "éªè¯åºé"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
#, fuzzy
msgid "is not available."
msgstr "è¯ä¹¦åéå表ï¼CRLï¼ä¸å¯ç¨\n"
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "ç¾åææ\n"
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "è§£å¯æ¶æ¯"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -503,11 +554,11 @@ msgid ""
"switching to PGP/Inline in GpgOL's options."
msgstr ""
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -519,95 +570,84 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr ""
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr ""
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr ""
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
msgstr ""
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
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:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "注éï¼ä½¿ç¨å
¼å®¹æ§åæ°ï¼%s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[æ 主é¢]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr "[å
容ä¸å¯è§ï¼å 为 GpgOL å¤çé误]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr ""
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr ""
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
msgstr ""
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr ""
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr ""
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
msgstr ""
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
#, fuzzy
msgid "Encrypted message (decryption not possible)"
msgstr "ä¸å¯å 坿ç¾åç©ºæ¶æ¯ã"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
msgstr ""
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
#, fuzzy
msgid "No message selected"
msgstr "æ¤æ¶æ¯æªè¢«å å¯ã"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -615,15 +655,24 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
msgstr ""
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
+msgid ""
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+
+#: src/wks-helper.cpp:410
+#, c-format
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -633,67 +682,84 @@ msgid ""
"Register automatically?"
msgstr ""
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr ""
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr ""
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
msgstr ""
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr ""
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr ""
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr ""
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr ""
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr ""
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
#, fuzzy
msgid "No recipients for encryption selected."
msgstr "没ææå®è¦å å¯ç»çæ¶ä»¶äºº"
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
#, fuzzy
msgid "Resolving recipients..."
msgstr "å½åæ¶ä»¶äººï¼"
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
#, fuzzy
msgid "Encrypting..."
msgstr "å å¯"
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr ""
+#~ msgid "Message sending"
+#~ msgstr "æ¶æ¯åéä¸"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - ä¿åéä»¶"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "è°è¯è¾åºï¼ç¨æ¥åæé®é¢ï¼"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "注éï¼ä½¿ç¨å
¼å®¹æ§åæ°ï¼%s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr "[å
容ä¸å¯è§ï¼å 为 GpgOL å¤çé误]"
+
#~ msgid ""
#~ "The user interface server is not available or could not be started in "
#~ "time. You may want to try again."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b1a73c..17967bb 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@g10code.com\n"
-"POT-Creation-Date: 2018-06-12 11:16+0200\n"
+"POT-Creation-Date: 2018-07-24 08:32+0200\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) \n"
"Language-Team: \n"
@@ -18,170 +18,217 @@ msgstr ""
"X-Generator: Poedit 1.8.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/addin-options.cpp:41
-msgid "General"
-msgstr "éç¨"
+#: src/addin-options.cpp:39
+msgid "GnuPG System"
+msgstr ""
-#: src/addin-options.cpp:42
+#: src/addin-options.cpp:40
msgid "Enable the S/MIME support"
msgstr "åç¨ S/MIME æ¯æ´"
-#: src/addin-options.cpp:44
-msgid "Message sending"
-msgstr "è¨æ¯å³éä¸"
+#: src/addin-options.cpp:41 src/addin-options.cpp:147
+msgid "Configure GpgOL"
+msgstr ""
+
+#: src/addin-options.cpp:42
+msgid "Automation"
+msgstr ""
+
+#: src/addin-options.cpp:43
+msgid "General"
+msgstr "éç¨"
#: src/addin-options.cpp:45
+#, fuzzy
+msgid "Automatically secure &messages"
+msgstr "è§£å¯è¨æ¯"
+
+#: src/addin-options.cpp:46
+msgid "Configure GnuPG"
+msgstr ""
+
+#: src/addin-options.cpp:47
+msgid "Debug..."
+msgstr ""
+
+#: src/addin-options.cpp:48
+msgid "Version "
+msgstr ""
+
+#: src/addin-options.cpp:49
+msgid "&Resolve recipient keys automatically"
+msgstr ""
+
+#: src/addin-options.cpp:50
msgid "&Encrypt new messages by default"
msgstr "é è¨å 坿°è¨æ¯ï¼&Eï¼"
-#: src/addin-options.cpp:46
+#: src/addin-options.cpp:51
msgid "&Sign new messages by default"
msgstr "é è¨ç°½åæ°è¨æ¯ï¼&Sï¼"
-#: src/addin-options.cpp:47
+#: src/addin-options.cpp:52
msgid "&Send OpenPGP mails without attachments as PGP/Inline"
msgstr ""
-#: src/addin-options.cpp:49
+#: src/addin-options.cpp:54
msgid "S&elect crypto settings automatically for reply and forward"
msgstr ""
-#: src/addin-options.cpp:51
-msgid "&Resolve recipient keys automatically"
+#: src/addin-options.cpp:56
+msgid "&Prefer S/MIME when automatically resolving recipients"
msgstr ""
-#: src/addin-options.cpp:54
-msgid "Debug..."
+#: src/addin-options.cpp:59
+msgid "Enable or disable any automated key handling."
msgstr ""
-#: src/addin-options.cpp:55
-msgid "Configure GnuPG"
+#: src/addin-options.cpp:60
+msgid "Automate trust based on communication history."
msgstr ""
-#: src/addin-options.cpp:56
-msgid "Version "
+#: src/addin-options.cpp:61
+msgid ""
+"This changes the trust model to \"tofu+pgp\" which tracks the history of key "
+"usage. Automated trust can never exceed level 2."
msgstr ""
-#: src/addin-options.cpp:114 src/ribbon-callbacks.cpp:665
+#: src/addin-options.cpp:62
+msgid "experimental"
+msgstr ""
+
+#: src/addin-options.cpp:63
msgid ""
-"Could not find Kleopatra.\n"
-"Please reinstall Gpg4win with the Kleopatra component enabled."
+"Automatically toggles secure if keys with at least level 1 trust were found "
+"for all recipients."
msgstr ""
-#: src/addin-options.cpp:116 src/gpgoladdin.cpp:375 src/gpgoladdin.cpp:897
-#: src/gpgoladdin.cpp:932 src/gpgoladdin.cpp:1016 src/gpgoladdin.cpp:1018
-#: src/gpgoladdin.cpp:1055 src/mail.cpp:837 src/mail.cpp:1126 src/mail.cpp:1195
-#: src/mailitem-events.cpp:778 src/mailitem-events.cpp:797 src/main.c:371
-#: src/ribbon-callbacks.cpp:604 src/ribbon-callbacks.cpp:615
-#: src/ribbon-callbacks.cpp:667 src/wks-helper.cpp:442
-#: src/cryptcontroller.cpp:299
-msgid "GpgOL"
-msgstr "GpgOL"
+#: src/addin-options.cpp:64
+msgid "Toggles the encrypt option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:65
+msgid "Toggles the sign option for all new mails."
+msgstr ""
+
+#: src/addin-options.cpp:66
+msgid ""
+"Toggles sign, encrypt options if the original mail was signed or encrypted."
+msgstr ""
-#: src/common.c:239
-msgid "GpgOL - Save attachment"
-msgstr "GpgOL - å²åéä»¶"
+#: src/addin-options.cpp:67
+msgid ""
+"Instead of using the PGP/MIME format, which properly handles attachments and "
+"encoding, the deprecated PGP/Inline is used.\n"
+"This can be required for compatibility but should generally not be used."
+msgstr ""
-#: src/common.c:1073
+#: src/common.cpp:768
#, fuzzy
msgid "GpgOL Error"
msgstr "GpgOL"
-#: src/config-dialog.c:38
-msgid "Debug output (for analysing problems)"
-msgstr "åµé¯è¼¸åºï¼ç¨ä¾åæåé¡ï¼"
-
-#: src/gpgoladdin.cpp:507 src/mail.cpp:1934 src/mail.cpp:2005
+#: src/gpgoladdin.cpp:515 src/mail.cpp:2065 src/mail.cpp:2136
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "è§£å¯è¨æ¯"
-#: src/gpgoladdin.cpp:508 src/mail.cpp:1935 src/mail.cpp:2006
+#: src/gpgoladdin.cpp:516 src/mail.cpp:2066 src/mail.cpp:2137
msgid "GpgOL: Trusted Sender Address"
msgstr ""
-#: src/gpgoladdin.cpp:833
+#: src/gpgoladdin.cpp:844
#, fuzzy
msgid "Encrypt the message"
msgstr "è§£å¯è¨æ¯"
-#: src/gpgoladdin.cpp:835
+#: src/gpgoladdin.cpp:846
msgid "Encrypts the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:837
+#: src/gpgoladdin.cpp:848
#, fuzzy
msgid "Sign the message"
msgstr "è§£å¯è¨æ¯"
-#: src/gpgoladdin.cpp:839
+#: src/gpgoladdin.cpp:850
msgid "Sign the message and all attachments before sending"
msgstr ""
-#: src/gpgoladdin.cpp:842
+#: src/gpgoladdin.cpp:853
#, fuzzy
msgid "Sign and encrypt the message"
msgstr "è§£å¯è¨æ¯"
-#: src/gpgoladdin.cpp:844
+#: src/gpgoladdin.cpp:855
msgid ""
"Encrypting and cryptographically signing a message means that the recipients "
"can be sure that no one modified the message and only the recipients can "
"read it"
msgstr ""
-#: src/gpgoladdin.cpp:848
+#: src/gpgoladdin.cpp:859
msgid "Open the settings dialog for GpgOL"
msgstr ""
-#: src/gpgoladdin.cpp:898 src/gpgoladdin.cpp:1019
+#: src/gpgoladdin.cpp:908 src/gpgoladdin.cpp:943 src/gpgoladdin.cpp:1027
+#: src/gpgoladdin.cpp:1029 src/gpgoladdin.cpp:1066 src/gpgoladdin.cpp:1170
+#: src/mail.cpp:907 src/mail.cpp:1213 src/mail.cpp:1282 src/mail.cpp:1855
+#: src/mailitem-events.cpp:830 src/mailitem-events.cpp:849
+#: src/ribbon-callbacks.cpp:657 src/ribbon-callbacks.cpp:668
+#: src/ribbon-callbacks.cpp:720 src/wks-helper.cpp:454
+#: src/cryptcontroller.cpp:308
+msgid "GpgOL"
+msgstr "GpgOL"
+
+#: src/gpgoladdin.cpp:909 src/gpgoladdin.cpp:1030
msgid "Secure"
msgstr ""
-#: src/gpgoladdin.cpp:899 src/gpgoladdin.cpp:1020
+#: src/gpgoladdin.cpp:910 src/gpgoladdin.cpp:1031
msgid "Sign"
msgstr "ç°½å"
-#: src/gpgoladdin.cpp:900 src/gpgoladdin.cpp:1021
+#: src/gpgoladdin.cpp:911 src/gpgoladdin.cpp:1032
msgid "Encrypt"
msgstr "å å¯"
-#: src/gpgoladdin.cpp:1023
+#: src/gpgoladdin.cpp:1034
msgid "&Print decrypted"
msgstr ""
-#: src/mail.cpp:324
+#: src/mail.cpp:364
msgid ""
"Not all attachments were encrypted or signed.\n"
"The unsigned / unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:329
+#: src/mail.cpp:369
msgid ""
"Not all attachments were signed.\n"
"The unsigned attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:334
+#: src/mail.cpp:374
msgid ""
"Not all attachments were encrypted.\n"
"The unencrypted attachments are:\n"
"\n"
msgstr ""
-#: src/mail.cpp:374
+#: src/mail.cpp:414
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:377
+#: src/mail.cpp:417
msgid "GpgOL Warning"
msgstr ""
-#: src/mail.cpp:835
+#: src/mail.cpp:904
#, fuzzy, c-format
msgid ""
"Crypto operation failed:\n"
@@ -190,11 +237,11 @@ msgstr ""
"è§£å¯å¤±æ\n"
"ï¼%sï¼"
-#: src/mail.cpp:936
+#: src/mail.cpp:1006
msgid "Pubkey directory confirmation"
msgstr ""
-#: src/mail.cpp:937
+#: src/mail.cpp:1007
msgid ""
"This is a confirmation request to publish your Pubkey in the directory for "
"your domain.\n"
@@ -203,43 +250,43 @@ msgid ""
"directory, simply ignore this message.\n"
msgstr ""
-#: src/mail.cpp:945
+#: src/mail.cpp:1015
#, fuzzy
msgid "message"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:946
+#: src/mail.cpp:1016
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1127 src/mail.cpp:1196
+#: src/mail.cpp:1214 src/mail.cpp:1283
msgid "HTML display disabled."
msgstr ""
-#: src/mail.cpp:1128 src/mail.cpp:1197
+#: src/mail.cpp:1215 src/mail.cpp:1284
msgid "HTML content in unsigned S/MIME mails is insecure."
msgstr ""
-#: src/mail.cpp:1131 src/mail.cpp:1200
+#: src/mail.cpp:1218 src/mail.cpp:1287
msgid "GpgOL will only show such mails as text."
msgstr ""
-#: src/mail.cpp:1134
+#: src/mail.cpp:1221
#, fuzzy
msgid "This message is shown only once."
msgstr "æ¤è¨æ¯æªè¢«å å¯ã"
-#: src/mail.cpp:1203
+#: src/mail.cpp:1290
msgid ""
"Please ask the sender to sign the message or\n"
"to send it with a plain text alternative."
msgstr ""
-#: src/mail.cpp:1374
+#: src/mail.cpp:1467
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
-#: src/mail.cpp:1376
+#: src/mail.cpp:1469
msgid ""
"G Suite Sync breaks outgoing crypto mails with attachments.\n"
"Using crypto and attachments with G Suite Sync is not supported.\n"
@@ -247,110 +294,114 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:2194
+#: src/mail.cpp:2329
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:2198
+#: src/mail.cpp:2333
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:2202
+#: src/mail.cpp:2337
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:2206
+#: src/mail.cpp:2341
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:2210
+#: src/mail.cpp:2345
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2349
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:2218
+#: src/mail.cpp:2353
#, fuzzy
msgid "Encrypted"
msgstr "å å¯"
-#: src/mail.cpp:2227 src/mail.cpp:2229 src/ribbon-callbacks.cpp:517
+#: src/mail.cpp:2362 src/mail.cpp:2364 src/ribbon-callbacks.cpp:565
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:2241
+#: src/mail.cpp:2376
#, fuzzy
msgid "Signed and encrypted message"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2245
+#: src/mail.cpp:2380
#, fuzzy
msgid "Signed message"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2249
+#: src/mail.cpp:2384
#, fuzzy
msgid "Encrypted message"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2252 src/ribbon-callbacks.cpp:540
+#: src/mail.cpp:2387 src/ribbon-callbacks.cpp:589
#, fuzzy
msgid "Insecure message"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2263 src/mail.cpp:2274
+#: src/mail.cpp:2398 src/mail.cpp:2409
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2266
+#: src/mail.cpp:2401
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2284
+#: src/mail.cpp:2419
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2288
+#: src/mail.cpp:2423
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2292
+#: src/mail.cpp:2427
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2315
+#: src/mail.cpp:2450
#, fuzzy
msgid "You signed this message."
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2319
+#: src/mail.cpp:2454
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2323
+#: src/mail.cpp:2458
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2336
+#: src/mail.cpp:2471
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2341
+#: src/mail.cpp:2476
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2349
+#: src/mail.cpp:2484
+msgid "The mail provider of the recipient served this key."
+msgstr ""
+
+#: src/mail.cpp:2489
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2359
+#: src/mail.cpp:2499
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -358,142 +409,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2375
+#: src/mail.cpp:2516
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2382
+#: src/mail.cpp:2523
#, 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:2396
+#: src/mail.cpp:2538
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2397
+#: src/mail.cpp:2539
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2405
+#: src/mail.cpp:2547
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2410
+#: src/mail.cpp:2552
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2419
+#: src/mail.cpp:2561
#, fuzzy
msgid "The signature is expired.\n"
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2423
+#: src/mail.cpp:2565
#, fuzzy
msgid "The used certificate"
msgstr "é©èåºé¯"
-#: src/mail.cpp:2431
+#: src/mail.cpp:2573
#, fuzzy
msgid "is not available."
msgstr "èæ¸åé·å表ï¼CRLï¼ä¸å¯ç¨\n"
-#: src/mail.cpp:2435
+#: src/mail.cpp:2577
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2439
+#: src/mail.cpp:2581
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2443
+#: src/mail.cpp:2585
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2447 src/mail.cpp:2451
+#: src/mail.cpp:2589 src/mail.cpp:2593
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2456
+#: src/mail.cpp:2598
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2462
+#: src/mail.cpp:2604
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2475
+#: src/mail.cpp:2618
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2479
+#: src/mail.cpp:2622
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2484
+#: src/mail.cpp:2627
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2488
+#: src/mail.cpp:2631
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2498
+#: src/mail.cpp:2641
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2502
+#: src/mail.cpp:2645
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2510
+#: src/mail.cpp:2653
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2514
+#: src/mail.cpp:2657
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "ç°½åææ\n"
-#: src/mail.cpp:2525
+#: src/mail.cpp:2668
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2529
+#: src/mail.cpp:2672
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2530
+#: src/mail.cpp:2673
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2534
+#: src/mail.cpp:2677
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2535
+#: src/mail.cpp:2678
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2859
+#: src/mail.cpp:3000
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "è§£å¯è¨æ¯"
-#: src/mail.cpp:2861
+#: src/mail.cpp:3002
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -503,11 +554,11 @@ msgid ""
"switching to PGP/Inline in GpgOL's options."
msgstr ""
-#: src/mailitem-events.cpp:315 src/mailitem-events.cpp:850
+#: src/mailitem-events.cpp:310 src/mailitem-events.cpp:902
msgid "Sorry, that's not possible, yet"
msgstr ""
-#: src/mailitem-events.cpp:317
+#: src/mailitem-events.cpp:312
#, c-format
msgid ""
"GpgOL has prevented the change to the \"%s\" property.\n"
@@ -519,95 +570,84 @@ msgid ""
"For example by right clicking but not selecting the message.\n"
msgstr ""
-#: src/mailitem-events.cpp:779
+#: src/mailitem-events.cpp:831
msgid "Dangerous reply"
msgstr ""
-#: src/mailitem-events.cpp:780
+#: src/mailitem-events.cpp:832
msgid "Dangerous forward"
msgstr ""
-#: src/mailitem-events.cpp:781
+#: src/mailitem-events.cpp:833
msgid "Unsigned S/MIME mails are not integrity protected."
msgstr ""
-#: src/mailitem-events.cpp:787
+#: src/mailitem-events.cpp:839
msgid "For security reasons no decrypted contents are included in this reply."
msgstr ""
-#: src/mailitem-events.cpp:792
+#: src/mailitem-events.cpp:844
msgid ""
"For security reasons no decrypted contents are included in the forwarded "
"mail."
msgstr ""
-#: src/mailitem-events.cpp:847
+#: src/mailitem-events.cpp:899
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:370
-#, c-format
-msgid "Note: Using compatibility flags: %s"
-msgstr "註éï¼ä½¿ç¨ç¸å®¹æ§åæ¸ï¼%s"
-
-#: src/mapihelp.cpp:1917 src/mapihelp.cpp:1925 src/mapihelp.cpp:1933
+#: src/mapihelp.cpp:1927 src/mapihelp.cpp:1935 src/mapihelp.cpp:1943
msgid "[no subject]"
msgstr "[ç¡ä¸»é¡]"
-#: src/mapihelp.cpp:3366
-msgid ""
-"[The content of this message is not visible due to an processing error in "
-"GpgOL.]"
-msgstr "[å
§å®¹ä¸å¯è¦ï¼å çº GpgOL èçé¯èª¤]"
-
-#: src/parsecontroller.cpp:164
+#: src/parsecontroller.cpp:167
msgid "Unknown Key:"
msgstr ""
-#: src/parsecontroller.cpp:179
+#: src/parsecontroller.cpp:182
msgid "Decryption canceled or timed out."
msgstr ""
-#: src/parsecontroller.cpp:193
+#: src/parsecontroller.cpp:196
msgid ""
"No secret key found to decrypt the message. It is encrypted to the following "
"keys:"
msgstr ""
-#: src/parsecontroller.cpp:199
+#: src/parsecontroller.cpp:202
msgid "Could not decrypt the data: "
msgstr ""
-#: src/parsecontroller.cpp:203
+#: src/parsecontroller.cpp:206
msgid "Failed to parse the mail."
msgstr ""
-#: src/parsecontroller.cpp:207
+#: src/parsecontroller.cpp:210
msgid ""
"Data is not integrity protected. Decrypting it could be a security problem. "
"(no MDC)"
msgstr ""
-#: src/parsecontroller.cpp:219 src/parsecontroller.cpp:295
+#: src/parsecontroller.cpp:222 src/parsecontroller.cpp:299
#, fuzzy
msgid "Encrypted message (decryption not possible)"
msgstr "ä¸å¯å å¯æç°½åç©ºè¨æ¯ã"
-#: src/parsecontroller.cpp:296
+#: src/parsecontroller.cpp:300
msgid ""
"Failed to find GnuPG please ensure that GnuPG or Gpg4win is properly "
"installed."
msgstr ""
-#: src/ribbon-callbacks.cpp:544
+#: src/ribbon-callbacks.cpp:593
#, fuzzy
msgid "No message selected"
msgstr "æ¤è¨æ¯æªè¢«å å¯ã"
-#: src/ribbon-callbacks.cpp:601
+#: src/ribbon-callbacks.cpp:654
#, c-format
msgid ""
"The message was not cryptographically signed.\n"
@@ -615,15 +655,24 @@ msgid ""
"or if someone faked the sender address."
msgstr ""
-#: src/ribbon-callbacks.cpp:612
+#: src/ribbon-callbacks.cpp:665
msgid ""
"There was an error verifying the signature.\n"
"Full details:\n"
msgstr ""
-#: src/wks-helper.cpp:404
+#: src/ribbon-callbacks.cpp:718
+msgid ""
+"Could not find Kleopatra.\n"
+"Please reinstall Gpg4win with the Kleopatra component enabled."
+msgstr ""
+
+#: src/wks-helper.cpp:410
+#, c-format
msgid ""
-"A Pubkey directory is available for your domain.\n"
+"A Pubkey directory is available for the address:\n"
+"\n"
+"\t%s\n"
"\n"
"Register your Pubkey in that directory to make\n"
"it easy for others to send you encrypted mail.\n"
@@ -633,67 +682,84 @@ msgid ""
"Register automatically?"
msgstr ""
-#: src/wks-helper.cpp:409
+#: src/wks-helper.cpp:419
msgid "GpgOL: Pubkey directory available!"
msgstr ""
-#: src/wks-helper.cpp:491
+#: src/wks-helper.cpp:503
msgid "GpgOL: Directory request failed"
msgstr ""
-#: src/wks-helper.cpp:504
+#: src/wks-helper.cpp:516
msgid ""
"You might receive a confirmation challenge from\n"
"your provider to finish the registration."
msgstr ""
-#: src/wks-helper.cpp:506
+#: src/wks-helper.cpp:518
msgid "GpgOL: Registration request sent!"
msgstr ""
-#: src/wks-helper.cpp:693
+#: src/wks-helper.cpp:709
msgid "Confirm registration?"
msgstr ""
-#: src/wks-helper.cpp:694
+#: src/wks-helper.cpp:710
msgid "GpgOL: Pubkey directory confirmation"
msgstr ""
-#: src/wks-helper.cpp:747
+#: src/wks-helper.cpp:763
msgid "GpgOL: Confirmation failed"
msgstr ""
-#: src/wks-helper.cpp:759
+#: src/wks-helper.cpp:775
msgid "Your Pubkey can soon be retrieved from your domain."
msgstr ""
-#: src/wks-helper.cpp:760
+#: src/wks-helper.cpp:776
msgid "GpgOL: Request confirmed!"
msgstr ""
-#: src/cryptcontroller.cpp:298
+#: src/cryptcontroller.cpp:307
#, fuzzy
msgid "No recipients for encryption selected."
msgstr "æ²ææå®è¦å å¯çµ¦çæ¶ä»¶äºº"
-#: src/cryptcontroller.cpp:407
+#: src/cryptcontroller.cpp:443
#, fuzzy
msgid "Resolving recipients..."
msgstr "ç¶åæ¶ä»¶äººï¼"
-#: src/cryptcontroller.cpp:411
+#: src/cryptcontroller.cpp:447
msgid "Resolving signers..."
msgstr ""
-#: src/cryptcontroller.cpp:1063
+#: src/cryptcontroller.cpp:1099
#, fuzzy
msgid "Encrypting..."
msgstr "å å¯"
-#: src/cryptcontroller.cpp:1067
+#: src/cryptcontroller.cpp:1103
msgid "Signing..."
msgstr ""
+#~ msgid "Message sending"
+#~ msgstr "è¨æ¯å³éä¸"
+
+#~ msgid "GpgOL - Save attachment"
+#~ msgstr "GpgOL - å²åéä»¶"
+
+#~ msgid "Debug output (for analysing problems)"
+#~ msgstr "åµé¯è¼¸åºï¼ç¨ä¾åæåé¡ï¼"
+
+#~ msgid "Note: Using compatibility flags: %s"
+#~ msgstr "註éï¼ä½¿ç¨ç¸å®¹æ§åæ¸ï¼%s"
+
+#~ msgid ""
+#~ "[The content of this message is not visible due to an processing error in "
+#~ "GpgOL.]"
+#~ msgstr "[å
§å®¹ä¸å¯è¦ï¼å çº GpgOL èçé¯èª¤]"
+
#~ msgid ""
#~ "The user interface server is not available or could not be started in "
#~ "time. You may want to try again."
--
2.11.0