[git] GpgOL - branch, master, updated. gpgol-2.0.6-80-g18db01e
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Mar 7 10:16:59 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, master has been updated
via 18db01ed4915a38622c90c81d16f1b7e812c3917 (commit)
via fde43045b717413d5358f3cc06592a83ebef7805 (commit)
via 6a3fc31f4b02388fb6b7e2ca1e8673303632d002 (commit)
from 808be5a08d8a6f46f9e6eff82e23797ae9ec5343 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 18db01ed4915a38622c90c81d16f1b7e812c3917
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 7 10:01:38 2018 +0100
Update translations and fix some german strings
* po: Update.
diff --git a/po/de.po b/po/de.po
index d516fd5..d58fd75 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
-"PO-Revision-Date: 2018-03-07 08:24+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
+"PO-Revision-Date: 2018-03-07 08:59+0100\n"
"Last-Translator: Andre Heinecke <andre.heinecke at intevation.de>\n"
"Language-Team: English <kde-i18n-de at kde.org>\n"
"Language: en_US\n"
@@ -175,11 +175,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Möchten Sie diesen Ordner von GpgOL befreien?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Verschlüsselte Nachricht"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Vertraute Absenderadresse"
@@ -443,7 +443,7 @@ msgstr ""
"<p>Wenn sie dies nicht angefordert haben, können Sie diese Mail ignorieren.</"
"p>\n"
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
msgid "Encrypted message"
msgstr "Verschlüsselte Nachricht"
@@ -451,7 +451,7 @@ msgstr "Verschlüsselte Nachricht"
msgid "Please wait while the message is being decrypted / verified..."
msgstr "Bitte warten Sie während die Nachricht entschlüsselt / geprüft wird..."
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr "GpgOL: Oops, G Suite Sync Konto erkannt"
@@ -468,123 +468,93 @@ msgstr ""
"\n"
"Details siehe: https://dev.gnupg.org/T3545"
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-"G Suite Sync bricht ausgehende, signierte, Mails.\n"
-"Sicherung der Integrität (signieren) wird mit G Suite Sync nicht "
-"unterstützt.\n"
-"\n"
-"Details siehe: https://dev.gnupg.org/T3545"
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-"G Suite Sync bricht ausgehende, signierte, Mails.\n"
-"Sicherung der Integrität (signieren) wird mit G Suite Sync nicht "
-"unterstützt.\n"
-"\n"
-"Details siehe: https://dev.gnupg.org/T3545\n"
-"\n"
-"Möchten Sie die Nachricht nur verschlüsseln?"
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr "Sicherheit Stufe 4"
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr "Vertrauen Stufe 4"
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr "Sicherheit Stufe 3"
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr "Vertrauen Stufe 3"
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr "Sicherheit Stufe 2"
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr "Vertrauen Stufe 2"
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
msgid "Encrypted"
msgstr "Verschlüsselt"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr "Unsicher"
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
msgid "Signed and encrypted message"
msgstr "Signierte und verschlüsselte Nachricht"
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
msgid "Signed message"
msgstr "Signierte Nachricht"
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
msgid "Insecure message"
msgstr "Unsichere Nachricht"
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
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:2023
+#: src/mail.cpp:1984
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:2041
+#: src/mail.cpp:2002
msgid "The encryption was VS-NfD-compliant."
msgstr "Diese Verschlüsselung war VS-NfD-konform."
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
msgid "The encryption was not VS-NfD-compliant."
msgstr "Diese Verschlüsselung war nicht VS-NfD-konform."
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
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:2072
+#: src/mail.cpp:2033
msgid "You signed this message."
msgstr "Sie haben diese Nachricht signiert."
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr "Die Idenität des Absenders wurde von ihnen selbst beglaubigt."
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
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:2093
+#: src/mail.cpp:2054
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:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -593,12 +563,12 @@ msgstr ""
"Die Idenität des Absenders wurde bestätigt von:\n"
"'%s'\n"
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr ""
"Einige vertrauenswürde Personen haben die Identität des Absenders beglaubigt."
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -610,11 +580,11 @@ msgstr ""
"Seit %s haben Sie %i Nachrichten an diesen Absender verschlüsselt und %i "
"Signaturen geprüft."
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr "The Signatur des Absenders wurde das erste mal verifiziert."
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -624,70 +594,70 @@ msgstr ""
"Nachrichten von diesem absender verifziert und %i Nachrichten verschlüssel "
"haben. Seit dem %s."
-#: src/mail.cpp:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr "Aber die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr "Die Absenderadresse ist nicht vertrauenswürdig da:"
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
msgid "The signature is invalid: \n"
msgstr "Die Signatur ist ungültig: \n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr "Beim überprüfen der Signatur ist ein Fehler aufgetreten.\n"
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
msgid "The signature is expired.\n"
msgstr "Die Signatur ist abgelaufen.\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr "Der verwendete Schlüssel"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used certificate"
msgstr "Das verwendete Zertifikat"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
msgid "is not available."
msgstr "ist nicht verfügbar."
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr "wurde zurückgezogen."
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr "ist veraltet. "
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr "ist nicht zum signieren vorgesehen. "
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr "wurde möglicherweise zurückgezogen."
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
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:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "passt nicht zu der mailaddresse: \"%s\". "
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr "wurde von keinem vertrauenswürdigen Schlüssel beglaubigt."
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -695,59 +665,59 @@ msgstr ""
"wurde von keiner vertrauenswürdigen Zertifizierungsstelle beglaubigt oder "
"die Zertifizierungsstelle ist unbekannt."
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr "Der Absender hat diese Adresse zurückgezogen."
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr "ist als nicht vertrauenswürdig markiert."
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
msgid "The signature is VS-NfD-compliant."
msgstr "Die Signatur ist VS-NfD-konform."
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
msgid "The signature is not VS-NfD-compliant."
msgstr "Die Signatur ist nicht VS-NfD-konform."
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
msgid "The encryption is VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist VS-NfD-konform."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
msgid "The encryption is not VS-NfD-compliant."
msgstr "Diese Verschlüsselung ist nicht VS-NfD-konform."
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
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:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr "Klicken Sie hier für Details zu dem Schlüssel"
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr "Klicken Sie hier für Details zu dem Zertifiakt."
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
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:2287
+#: src/mail.cpp:2248
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:2515
+#: src/mail.cpp:2476
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Verschlüsselung nicht möglich!"
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1198,6 +1168,50 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr "GpgOL: Eintragung bestätigt."
+#: src/cryptcontroller.cpp:394
+msgid "Resolving recipients..."
+msgstr "Empfänger auflösen..."
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr "Signierer auflösen..."
+
+#: src/cryptcontroller.cpp:994
+msgid "Encrypting..."
+msgstr "Verschlüsseln..."
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr "Signieren..."
+
+#~ msgid ""
+#~ "G Suite Sync breaks outgoing signed mails.\n"
+#~ "Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+#~ "\n"
+#~ "See: https://dev.gnupg.org/T3545 for details."
+#~ msgstr ""
+#~ "G Suite Sync bricht ausgehende, signierte, Mails.\n"
+#~ "Sicherung der Integrität (signieren) wird mit G Suite Sync nicht "
+#~ "unterstützt.\n"
+#~ "\n"
+#~ "Details siehe: https://dev.gnupg.org/T3545"
+
+#~ msgid ""
+#~ "G Suite Sync breaks outgoing signed mails.\n"
+#~ "Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
+#~ "\n"
+#~ "See: https://dev.gnupg.org/T3545 for details.\n"
+#~ "\n"
+#~ "Do you want to only encrypt the message?"
+#~ msgstr ""
+#~ "G Suite Sync bricht ausgehende, signierte, Mails.\n"
+#~ "Sicherung der Integrität (signieren) wird mit G Suite Sync nicht "
+#~ "unterstützt.\n"
+#~ "\n"
+#~ "Details siehe: https://dev.gnupg.org/T3545\n"
+#~ "\n"
+#~ "Möchten Sie die Nachricht nur verschlüsseln?"
+
#~ msgid "&Search for OpenPGP keys automatically when encrypting"
#~ msgstr "OpenPGP-&Schlüssel zum verschlüsseln automatisch suchen"
@@ -1344,9 +1358,6 @@ msgstr "GpgOL: Eintragung bestätigt."
#~ "\n"
#~ "Die Nachricht wird deswegen nicht für dieses Zertifikat verschlüsselt!"
-#~ msgid "Encryption"
-#~ msgstr "Verschlüsselung"
-
#~ msgid "Fingerprint: "
#~ msgstr "Fingerabdruck: "
@@ -1469,9 +1480,6 @@ msgstr "GpgOL: Eintragung bestätigt."
#~ msgid "Validity"
#~ msgstr "Gültigkeit"
-#~ msgid "Selected recipients:"
-#~ msgstr "Ausgewählte Empfänger:"
-
#~ msgid "Recipient which were NOT found"
#~ msgstr "Empfänger die NICHT gefunden wurden:"
diff --git a/po/fr.po b/po/fr.po
index 3e9939d..f69b207 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
"PO-Revision-Date: 2015-10-01 17:05+0200\n"
"Last-Translator: Olivier Serve <olivier.serve at atos.net>\n"
"Language-Team: French <kde-i18n-doc at kde.org>\n"
@@ -172,12 +172,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Voulez-vous récupérer ce dossier ?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Déchiffrer le message"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -422,7 +422,7 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
#, fuzzy
msgid "Encrypted message"
msgstr "Déchiffrer le message"
@@ -431,7 +431,7 @@ msgstr "Déchiffrer le message"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
@@ -443,123 +443,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
#, fuzzy
msgid "Encrypted"
msgstr "Chiffrer"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
#, fuzzy
msgid "Signed message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1984
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2041
+#: src/mail.cpp:2002
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2072
+#: src/mail.cpp:2033
#, fuzzy
msgid "You signed this message."
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2054
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -567,142 +549,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, 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:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
#, fuzzy
msgid "The used certificate"
msgstr "Erreur de vérification"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
#, fuzzy
msgid "is not available."
msgstr "La liste de révocation (CRL) n'est pas disponible\n"
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Cette signature est valide\n"
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2287
+#: src/mail.cpp:2248
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2515
+#: src/mail.cpp:2476
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Déchiffrer le message"
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1087,6 +1069,24 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
+#: src/cryptcontroller.cpp:394
+#, fuzzy
+msgid "Resolving recipients..."
+msgstr "Destinataires sélectionnés :"
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:994
+#, fuzzy
+msgid "Encrypting..."
+msgstr "Chiffrement"
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr ""
+
#, fuzzy
#~ msgid ""
#~ "Error creating file\n"
@@ -1164,9 +1164,6 @@ msgstr ""
#~ "\n"
#~ "Ce message ne sera pas chiffré avec ce certificat ! "
-#~ msgid "Encryption"
-#~ msgstr "Chiffrement"
-
#~ msgid "Fingerprint: "
#~ msgstr "Empreinte : "
@@ -1283,9 +1280,6 @@ msgstr ""
#~ msgid "Validity"
#~ msgstr "Validité"
-#~ msgid "Selected recipients:"
-#~ msgstr "Destinataires sélectionnés :"
-
#~ msgid "Recipient which were NOT found"
#~ msgstr "Destinataire non trouvé"
diff --git a/po/pt.po b/po/pt.po
index 5bfe6fd..a7208d8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
"PO-Revision-Date: 2017-10-16 14:17+0100\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -175,11 +175,11 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
msgid "GpgOL: Encrypted Message"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr "GpgOL: Endereço de Remetente Confiável"
@@ -438,7 +438,7 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
msgid "Encrypted message"
msgstr "Mensagem encriptada"
@@ -448,7 +448,7 @@ msgstr ""
"Por favor aguarda enquanto a mensagem está a ser desencriptada / "
"verificada..."
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
@@ -460,109 +460,91 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr "Nível de segurança 4"
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr "Nível de Confiança 4"
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr "Nível de Segurança 3"
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr "Nível de Confiança 3"
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr "Nível de Segurança 2"
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr "Nível de Confiança 2"
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
msgid "Encrypted"
msgstr "Encriptada"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr "Insegura"
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
msgid "Signed and encrypted message"
msgstr "Mensagem assinada e encriptada"
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
msgid "Signed message"
msgstr "Mensagem assinada"
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
msgid "Insecure message"
msgstr "Mensagem insegura"
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
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:2023
+#: src/mail.cpp:1984
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2041
+#: src/mail.cpp:2002
msgid "The encryption was VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
msgid "The encryption was not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
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:2072
+#: src/mail.cpp:2033
msgid "You signed this message."
msgstr "Assinaste esta mensagem."
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr "A identidade dos remetentes foi certificada por ti próprio."
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
msgid "The sender is allowed to certify identities for you."
msgstr "O remetente pode certificar identidades para ti."
-#: src/mail.cpp:2093
+#: src/mail.cpp:2054
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:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
@@ -571,11 +553,11 @@ msgstr ""
"A identidade dos remetentes é certificada pelo emissor confiável:\n"
"'%s'\n"
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr "Algumas pessoas confiáveis certificaram a identidade dos remetentes."
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -586,11 +568,11 @@ msgstr ""
"comunicação com este endereço desde %s.\n"
"Encriptaste %i e verificaste %i mensagens desde então."
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr "A assinatura dos remetentes foi verificada pela primeira vez."
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, c-format
msgid ""
"The senders address is not trustworthy yet because you only verified %i "
@@ -599,68 +581,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:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr "Mas o endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr "O endereço do remetente não é confiável porque:"
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
msgid "The signature is invalid: \n"
msgstr "A assinatura é inválida: \n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr "Houve um erro ao verificar a assinatura.\n"
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
msgid "The signature is expired.\n"
msgstr "A assinatura expirou.\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr "A chave usada"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used certificate"
msgstr "O certificado usado"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
msgid "is not available."
msgstr "não está disponível."
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr "está revogado."
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr "expirou."
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr "não é destinado a assinar."
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr "não pode ser verificado para revogação."
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
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:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr "não reivindica o endereço: \"%s\"."
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr "não está certificado por qualquer chave confiável."
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
@@ -668,58 +650,58 @@ msgstr ""
"não está certificado por uma Autoridade de Certificação confiável ou a "
"Autoridade de Certificação é desconhecida."
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr "O remetente marcou este endereço como revogado."
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr "está marcado como não confiável."
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
msgid "The signature is VS-NfD-compliant."
msgstr "A assinatura está em conformidade com VS-NfD."
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
msgid "The signature is not VS-NfD-compliant."
msgstr "A assinatura não está em conformidade com VS-NfD."
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
msgid "The encryption is VS-NfD-compliant."
msgstr "A encriptação está em conformidade com VS-NfD."
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
msgid "The encryption is not VS-NfD-compliant."
msgstr "A encriptação não está em conformidade com VS-NfD."
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
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:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr "Clica aqui para obter detalhes sobre a chave."
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr "Clica aqui para obter detalhes sobre o certificado."
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
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:2287
+#: src/mail.cpp:2248
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:2515
+#: src/mail.cpp:2476
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "GpgOL: Mensagem Encriptada"
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1141,6 +1123,24 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
+#: src/cryptcontroller.cpp:394
+#, fuzzy
+msgid "Resolving recipients..."
+msgstr "Destinatários seleccionados:"
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:994
+#, fuzzy
+msgid "Encrypting..."
+msgstr "Encriptação"
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr ""
+
#~ msgid "&Search for OpenPGP keys automatically when encrypting"
#~ msgstr "Procurar as chaves OpenPGP automaticamente ao encriptar"
@@ -1257,9 +1257,6 @@ msgstr ""
#~ "\n"
#~ "Esta mensagem não será encriptada para este certificado!"
-#~ msgid "Encryption"
-#~ msgstr "Encriptação"
-
#~ msgid "Fingerprint: "
#~ msgstr "Fingerprint: "
@@ -1379,9 +1376,6 @@ msgstr ""
#~ msgid "Validity"
#~ msgstr "Validade"
-#~ msgid "Selected recipients:"
-#~ msgstr "Destinatários seleccionados:"
-
#~ msgid "Recipient which were NOT found"
#~ msgstr "Destinatários NÃO encontrados"
diff --git a/po/sv.po b/po/sv.po
index b5c5ad4..28f8ce9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -164,12 +164,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "Dekryptera och validera meddelandet."
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -411,7 +411,7 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
#, fuzzy
msgid "Encrypted message"
msgstr "Dekryptera och validera meddelandet."
@@ -420,7 +420,7 @@ msgstr "Dekryptera och validera meddelandet."
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
@@ -432,123 +432,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
#, fuzzy
msgid "Encrypted"
msgstr "Kryptering"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
#, fuzzy
msgid "Signed and encrypted message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
#, fuzzy
msgid "Signed message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1984
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2041
+#: src/mail.cpp:2002
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2072
+#: src/mail.cpp:2033
#, fuzzy
msgid "You signed this message."
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2054
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -556,142 +538,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, 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:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
#, fuzzy
msgid "The signature is expired.\n"
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
#, fuzzy
msgid "The used certificate"
msgstr "Validering"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
#, fuzzy
msgid "is not available."
msgstr "Spärrlistan är inte tillgänglig\n"
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "Den här signaturen är giltig\n"
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2287
+#: src/mail.cpp:2248
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2515
+#: src/mail.cpp:2476
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "Dekryptera och validera meddelandet."
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1046,6 +1028,23 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
+#: src/cryptcontroller.cpp:394
+msgid "Resolving recipients..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:994
+#, fuzzy
+msgid "Encrypting..."
+msgstr "Kryptering"
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr ""
+
#, fuzzy
#~ msgid ""
#~ "Error creating file\n"
@@ -1111,9 +1110,6 @@ msgstr ""
#~ "\n"
#~ "Det här meddelandet kommer inte att krypteras med den här nyckeln!"
-#~ msgid "Encryption"
-#~ msgstr "Kryptering"
-
#~ msgid "Fingerprint: "
#~ msgstr "Fingeravtryck: "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bf3b05b..c47d904 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -168,12 +168,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤销这个文件夹吗？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密消息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -410,7 +410,7 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
#, fuzzy
msgid "Encrypted message"
msgstr "解密消息"
@@ -419,7 +419,7 @@ msgstr "解密消息"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
@@ -431,123 +431,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密消息"
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
#, fuzzy
msgid "Signed message"
msgstr "解密消息"
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "解密消息"
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1984
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2041
+#: src/mail.cpp:2002
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2072
+#: src/mail.cpp:2033
#, fuzzy
msgid "You signed this message."
msgstr "解密消息"
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2054
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -555,142 +537,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, 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:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "签名有效\n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
#, fuzzy
msgid "The signature is expired.\n"
msgstr "签名有效\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
#, fuzzy
msgid "The used certificate"
msgstr "验证出错"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
#, fuzzy
msgid "is not available."
msgstr "证书吊销列表（CRL）不可用\n"
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "签名有效\n"
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2287
+#: src/mail.cpp:2248
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2515
+#: src/mail.cpp:2476
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密消息"
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1072,6 +1054,24 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
+#: src/cryptcontroller.cpp:394
+#, fuzzy
+msgid "Resolving recipients..."
+msgstr "当前收件人："
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:994
+#, fuzzy
+msgid "Encrypting..."
+msgstr "加密"
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr ""
+
#, fuzzy
#~ msgid ""
#~ "Error creating file\n"
@@ -1146,9 +1146,6 @@ msgstr ""
#~ "\n"
#~ "这个消息将不会为这张证书加密！"
-#~ msgid "Encryption"
-#~ msgstr "加密"
-
#~ msgid "Fingerprint: "
#~ msgstr "指纹："
@@ -1262,9 +1259,6 @@ msgstr ""
#~ msgid "Validity"
#~ msgstr "有效性"
-#~ msgid "Selected recipients:"
-#~ msgstr "当前收件人："
-
#~ msgid "Recipient which were NOT found"
#~ msgstr "未找到的收件人"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b9f530..f3e9ff5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2018-03-06 15:25+0100\n"
+"POT-Creation-Date: 2018-03-07 10:01+0100\n"
"PO-Revision-Date: 2015-08-15 21:58+0800\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 at hotmail.com>\n"
"Language-Team: \n"
@@ -168,12 +168,12 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "你想要撤銷這個資料夾嗎？"
-#: src/gpgoladdin.cpp:446 src/mail.cpp:1691 src/mail.cpp:1762
+#: src/gpgoladdin.cpp:446 src/mail.cpp:1652 src/mail.cpp:1723
#, fuzzy
msgid "GpgOL: Encrypted Message"
msgstr "解密訊息"
-#: src/gpgoladdin.cpp:447 src/mail.cpp:1692 src/mail.cpp:1763
+#: src/gpgoladdin.cpp:447 src/mail.cpp:1653 src/mail.cpp:1724
msgid "GpgOL: Trusted Sender Address"
msgstr ""
@@ -410,7 +410,7 @@ msgid ""
"directory, simply ignore this message.</p>\n"
msgstr ""
-#: src/mail.cpp:820 src/mail.cpp:2006
+#: src/mail.cpp:820 src/mail.cpp:1967
#, fuzzy
msgid "Encrypted message"
msgstr "解密訊息"
@@ -419,7 +419,7 @@ msgstr "解密訊息"
msgid "Please wait while the message is being decrypted / verified..."
msgstr ""
-#: src/mail.cpp:1095
+#: src/mail.cpp:1097
msgid "GpgOL: Oops, G Suite Sync account detected"
msgstr ""
@@ -431,123 +431,105 @@ msgid ""
"See: https://dev.gnupg.org/T3545 for details."
msgstr ""
-#: src/mail.cpp:1114
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details."
-msgstr ""
-
-#: src/mail.cpp:1129
-msgid ""
-"G Suite Sync breaks outgoing signed mails.\n"
-"Ensuring mail integrity (signing) with G Suite Sync is not supported.\n"
-"\n"
-"See: https://dev.gnupg.org/T3545 for details.\n"
-"\n"
-"Do you want to only encrypt the message?"
-msgstr ""
-
-#: src/mail.cpp:1951
+#: src/mail.cpp:1912
msgid "Security Level 4"
msgstr ""
-#: src/mail.cpp:1955
+#: src/mail.cpp:1916
msgid "Trust Level 4"
msgstr ""
-#: src/mail.cpp:1959
+#: src/mail.cpp:1920
msgid "Security Level 3"
msgstr ""
-#: src/mail.cpp:1963
+#: src/mail.cpp:1924
msgid "Trust Level 3"
msgstr ""
-#: src/mail.cpp:1967
+#: src/mail.cpp:1928
msgid "Security Level 2"
msgstr ""
-#: src/mail.cpp:1971
+#: src/mail.cpp:1932
msgid "Trust Level 2"
msgstr ""
-#: src/mail.cpp:1975
+#: src/mail.cpp:1936
#, fuzzy
msgid "Encrypted"
msgstr "加密"
-#: src/mail.cpp:1984 src/mail.cpp:1986 src/ribbon-callbacks.cpp:1625
+#: src/mail.cpp:1945 src/mail.cpp:1947 src/ribbon-callbacks.cpp:1625
msgid "Insecure"
msgstr ""
-#: src/mail.cpp:1998
+#: src/mail.cpp:1959
#, fuzzy
msgid "Signed and encrypted message"
msgstr "解密訊息"
-#: src/mail.cpp:2002
+#: src/mail.cpp:1963
#, fuzzy
msgid "Signed message"
msgstr "解密訊息"
-#: src/mail.cpp:2009 src/ribbon-callbacks.cpp:1648
+#: src/mail.cpp:1970 src/ribbon-callbacks.cpp:1648
#, fuzzy
msgid "Insecure message"
msgstr "解密訊息"
-#: src/mail.cpp:2020 src/mail.cpp:2031
+#: src/mail.cpp:1981 src/mail.cpp:1992
msgid "You cannot be sure who sent, modified and read the message in transit."
msgstr ""
-#: src/mail.cpp:2023
+#: src/mail.cpp:1984
msgid "The message was signed but the verification failed with:"
msgstr ""
-#: src/mail.cpp:2041
+#: src/mail.cpp:2002
#, fuzzy
msgid "The encryption was VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2045
+#: src/mail.cpp:2006
#, fuzzy
msgid "The encryption was not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2049
+#: src/mail.cpp:2010
msgid "You cannot be sure who sent the message because it is not signed."
msgstr ""
-#: src/mail.cpp:2072
+#: src/mail.cpp:2033
#, fuzzy
msgid "You signed this message."
msgstr "解密訊息"
-#: src/mail.cpp:2076
+#: src/mail.cpp:2037
msgid "The senders identity was certified by yourself."
msgstr ""
-#: src/mail.cpp:2080
+#: src/mail.cpp:2041
msgid "The sender is allowed to certify identities for you."
msgstr ""
-#: src/mail.cpp:2093
+#: src/mail.cpp:2054
msgid "The senders identity was certified by several trusted people."
msgstr ""
-#: src/mail.cpp:2098
+#: src/mail.cpp:2059
#, c-format
msgid ""
"The senders identity is certified by the trusted issuer:\n"
"'%s'\n"
msgstr ""
-#: src/mail.cpp:2106
+#: src/mail.cpp:2067
msgid "Some trusted people have certified the senders identity."
msgstr ""
-#: src/mail.cpp:2116
+#: src/mail.cpp:2077
#, c-format
msgid ""
"The senders address is trusted, because you have established a communication "
@@ -555,142 +537,142 @@ msgid ""
"You encrypted %i and verified %i messages since."
msgstr ""
-#: src/mail.cpp:2132
+#: src/mail.cpp:2093
msgid "The senders signature was verified for the first time."
msgstr ""
-#: src/mail.cpp:2139
+#: src/mail.cpp:2100
#, 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:2153
+#: src/mail.cpp:2114
msgid "But the sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2154
+#: src/mail.cpp:2115
msgid "The sender address is not trustworthy because:"
msgstr ""
-#: src/mail.cpp:2162
+#: src/mail.cpp:2123
#, fuzzy
msgid "The signature is invalid: \n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2167
+#: src/mail.cpp:2128
msgid "There was an error verifying the signature.\n"
msgstr ""
-#: src/mail.cpp:2171
+#: src/mail.cpp:2132
#, fuzzy
msgid "The signature is expired.\n"
msgstr "簽名有效\n"
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
msgid "The used key"
msgstr ""
-#: src/mail.cpp:2175
+#: src/mail.cpp:2136
#, fuzzy
msgid "The used certificate"
msgstr "驗證出錯"
-#: src/mail.cpp:2183
+#: src/mail.cpp:2144
#, fuzzy
msgid "is not available."
msgstr "證書吊銷列表（CRL）不可用\n"
-#: src/mail.cpp:2187
+#: src/mail.cpp:2148
msgid "is revoked."
msgstr ""
-#: src/mail.cpp:2191
+#: src/mail.cpp:2152
msgid "is expired."
msgstr ""
-#: src/mail.cpp:2195
+#: src/mail.cpp:2156
msgid "is not meant for signing."
msgstr ""
-#: src/mail.cpp:2199 src/mail.cpp:2203
+#: src/mail.cpp:2160 src/mail.cpp:2164
msgid "could not be checked for revocation."
msgstr ""
-#: src/mail.cpp:2208
+#: src/mail.cpp:2169
msgid "is not the same as the key that was used for this address in the past."
msgstr ""
-#: src/mail.cpp:2214
+#: src/mail.cpp:2175
#, c-format
msgid "does not claim the address: \"%s\"."
msgstr ""
-#: src/mail.cpp:2227
+#: src/mail.cpp:2188
msgid "is not certified by any trustworthy key."
msgstr ""
-#: src/mail.cpp:2231
+#: src/mail.cpp:2192
msgid ""
"is not certified by a trustworthy Certificate Authority or the Certificate "
"Authority is unknown."
msgstr ""
-#: src/mail.cpp:2236
+#: src/mail.cpp:2197
msgid "The sender marked this address as revoked."
msgstr ""
-#: src/mail.cpp:2240
+#: src/mail.cpp:2201
msgid "is marked as not trustworthy."
msgstr ""
-#: src/mail.cpp:2250
+#: src/mail.cpp:2211
#, fuzzy
msgid "The signature is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2254
+#: src/mail.cpp:2215
#, fuzzy
msgid "The signature is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2262
+#: src/mail.cpp:2223
#, fuzzy
msgid "The encryption is VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2266
+#: src/mail.cpp:2227
#, fuzzy
msgid "The encryption is not VS-NfD-compliant."
msgstr "簽名有效\n"
-#: src/mail.cpp:2277
+#: src/mail.cpp:2238
msgid "Click here to change the key used for this address."
msgstr ""
-#: src/mail.cpp:2281
+#: src/mail.cpp:2242
msgid "Click here for details about the key."
msgstr ""
-#: src/mail.cpp:2282
+#: src/mail.cpp:2243
msgid "Click here for details about the certificate."
msgstr ""
-#: src/mail.cpp:2286
+#: src/mail.cpp:2247
msgid "Click here to search the key on the configured keyserver."
msgstr ""
-#: src/mail.cpp:2287
+#: src/mail.cpp:2248
msgid "Click here to search the certificate on the configured X509 keyserver."
msgstr ""
-#: src/mail.cpp:2515
+#: src/mail.cpp:2476
#, fuzzy
msgid "GpgOL: Encryption not possible!"
msgstr "解密訊息"
-#: src/mail.cpp:2517
+#: src/mail.cpp:2478
msgid ""
"Outlook returned an error when trying to send the encrypted mail.\n"
"\n"
@@ -1074,6 +1056,24 @@ msgstr ""
msgid "GpgOL: Request confirmed!"
msgstr ""
+#: src/cryptcontroller.cpp:394
+#, fuzzy
+msgid "Resolving recipients..."
+msgstr "當前收件人："
+
+#: src/cryptcontroller.cpp:398
+msgid "Resolving signers..."
+msgstr ""
+
+#: src/cryptcontroller.cpp:994
+#, fuzzy
+msgid "Encrypting..."
+msgstr "加密"
+
+#: src/cryptcontroller.cpp:998
+msgid "Signing..."
+msgstr ""
+
#, fuzzy
#~ msgid ""
#~ "Error creating file\n"
@@ -1148,9 +1148,6 @@ msgstr ""
#~ "\n"
#~ "這個訊息將不會為這張證書加密！"
-#~ msgid "Encryption"
-#~ msgstr "加密"
-
#~ msgid "Fingerprint: "
#~ msgstr "指紋："
@@ -1264,9 +1261,6 @@ msgstr ""
#~ msgid "Validity"
#~ msgstr "有效性"
-#~ msgid "Selected recipients:"
-#~ msgstr "當前收件人："
-
#~ msgid "Recipient which were NOT found"
#~ msgstr "未找到的收件人"
commit fde43045b717413d5358f3cc06592a83ebef7805
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 7 10:00:44 2018 +0100
Provide protocol argument to resolver
* src/cryptcontroller.cpp (CryptController::resolve_recipients):
Use Protocol parameter if S/MIME is disabled.
diff --git a/src/cryptcontroller.cpp b/src/cryptcontroller.cpp
index b3d39e5..be4f7fb 100644
--- a/src/cryptcontroller.cpp
+++ b/src/cryptcontroller.cpp
@@ -398,6 +398,12 @@ CryptController::resolve_keys ()
args.push_back (std::string (_("Resolving signers...")));
}
+ if (!opt.enable_smime)
+ {
+ args.push_back (std::string ("--protocol"));
+ args.push_back (std::string ("pgp"));
+ }
+
if (m_sign)
{
args.push_back (std::string ("--sign"));
commit 6a3fc31f4b02388fb6b7e2ca1e8673303632d002
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Mar 7 08:59:23 2018 +0100
Add cryptcontroller to Potfiles
* po/POTFILES.in: Add cryptcontroller.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c815cd0..65ff428 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,3 +40,4 @@ src/user-events.h
src/keycache.cpp
src/wks-helper.cpp
src/overlay.cpp
+src/cryptcontroller.cpp
-----------------------------------------------------------------------
Summary of changes:
po/POTFILES.in | 1 +
po/de.po | 200 +++++++++++++++++++++++++-----------------------
po/fr.po | 160 +++++++++++++++++++-------------------
po/pt.po | 160 +++++++++++++++++++-------------------
po/sv.po | 156 ++++++++++++++++++-------------------
po/zh_CN.po | 160 +++++++++++++++++++-------------------
po/zh_TW.po | 160 +++++++++++++++++++-------------------
src/cryptcontroller.cpp | 6 ++
8 files changed, 495 insertions(+), 508 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list