[git] GpgOL - branch, master, updated. gpgol-1.1.3-64-ge512053
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Aug 13 11:53:14 CEST 2013
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 e512053443e6f1d7fd2fa87d625535c95c9a400f (commit)
via 7f11a04956e10e3c7e3742b852aa5d1b55962b8d (commit)
via b86f87156a46376272df9595fd0f38069a06af84 (commit)
via f95945400c04e54a5b7bc0bd83f12d38124431b9 (commit)
via 4455aaf2f2274becf5746b38da0a4a0ffb88ce72 (commit)
from 94e0c024ce44bb6a6c62647c806b55f4c26cf9a6 (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 e512053443e6f1d7fd2fa87d625535c95c9a400f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Aug 13 09:23:41 2013 +0000
Update translations
* po/de.po: Update translated messages
* po/pt.po, po/sv.po: Update autogenerated files.
* src/gpgoladdin.cpp (getCustomUI): Minor message changes.
diff --git a/po/de.po b/po/de.po
index 58b2b8d..ad13f19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\n"
"PO-Revision-Date: 2009-06-18 19:18+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
@@ -41,7 +41,7 @@ msgstr ""
"um die gesamte Nachricht nochmal zu entschlüsseln. Danach können\n"
"Sie das Attachment wieder öffenen."
-#: src/common.c:232
+#: src/common.c:269
msgid "GpgOL - Save attachment"
msgstr "GpgOL - Anlage Speichern"
@@ -59,13 +59,15 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
msgid "GpgOL"
msgstr "GpgOL"
@@ -360,8 +362,8 @@ msgstr "Dateischreibfehler"
msgid "I/O-Error"
msgstr "Ein-/Ausgabefehler"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
msgid "General"
msgstr "Allgemein"
@@ -429,7 +431,7 @@ msgstr ""
msgid "This is GpgOL version %s"
msgstr "Dies ist GpgOL Version %s"
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
msgid "Welcome to GpgOL "
msgstr "Willkommen zu GpgOL "
@@ -724,55 +726,158 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Möchten Sie diesen Ordner von GpgOL befreien?"
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+msgid "Start the Certificate Management Software"
+msgstr "Starten der Zertifikatsverwaltung"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+"Öffnet GPA oder Kleopatra um Zertifikate zu verwalten. Dies kann genutzt "
+"werden um eigene Zertifikate zu generieren."
+
+#: src/gpgoladdin.cpp:547
+msgid "Encrypt the text of the message"
+msgstr "Verschlüsselt den Text der Nachricht"
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+"Auswählen der Empfängerzertifikate und ersetzen des Nachrichtentexts durch "
+"die verschlüsselte Nachricht."
+
+#: src/gpgoladdin.cpp:553
+msgid "Add a file as an encrypted attachment"
+msgstr "Hinzufügen einer Datei als verschlüsselter Anhang"
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr "Verschlüsselt eine Datei und fügt diese als Anhang hinzu"
+
+#: src/gpgoladdin.cpp:558
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr "Hinzufügen einer Datei als verschlüsselter Anhang mit Signatur"
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+"Verschlüsselt eine Datei, signiert diese und fügt die Signatur und die "
+"Verschlüsselte Datei als Anhang an."
+
+#: src/gpgoladdin.cpp:563
+msgid "Decrypt the message"
+msgstr "Entschlüsseln der Nachricht."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+"Sucht nach PGP oder S/MIME verschlüsselten Daten im Nachrichtentext und "
+"entschlüsselt diese."
+
+#: src/gpgoladdin.cpp:568
+msgid "Add a signature of the message"
+msgstr "Hinzufügen einer Signierten Nachricht"
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+"Fügt eine signierte Kopie des Nachrichtentexts als opake Signatur an. Eine "
+"opake Signatur stellt sicher das der signierte Text nicht verfälscht wird "
+"indem es den Text in die Signatur einbettet. Die Kombination aus Signatur "
+"und Nachricht wird unterhalb des Textes angefügt. Die Nachricht wird "
+"hierdurch nicht verschlüsselt!"
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
msgid "Start Certificate Manager"
msgstr "Zertifikatsverwaltung starten"
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
msgid "Textbody"
msgstr "Textkörper"
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr "Signieren"
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr "Signatur prüfen"
+
+#: src/gpgoladdin.cpp:670
+msgid "Attachments"
+msgstr "Anhänge"
+
+#: src/gpgoladdin.cpp:671
+msgid "Encrypted file"
+msgstr "Verschlüsselte Datei"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr "Verschlüsselte Datei mit Signatur"
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
msgid "Save and decrypt"
msgstr "Speichern und Entschlüsseln"
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
msgid "Please select text to encrypt."
msgstr "Bitte selektieren Sie den zu verschlüsselnden Text."
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
msgid "Textbody empty."
msgstr "Textkörper leer."
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
msgid "Please add at least one recipent."
msgstr "Bitte fügen Sie mindestens einen Empfänger hinzu."
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
msgid "Please select a Mail."
-msgstr "Bitte wäheln Sie eine Mail aus."
+msgstr "Bitte wählen Sie eine Mail aus."
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
msgid "Please select the data you wish to decrypt."
msgstr "Bitte selektieren Sie die zu entschlüsselnden Daten."
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
msgid "Nothing to decrypt."
msgstr "Nichts zu entschlüsseln."
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
msgid "Plain text"
msgstr "Klartext"
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr "Signierter Text"
+
+#: src/ribbon-callbacks.cpp:1008
+msgid "Select file to encrypt"
+msgstr "Auswählen der zu verschlüsselnden Datei"
+
+#~ msgid "Add a file and it's signature as an encrypted attachment"
+#~ msgstr "Hinzufügen einer Datei als verschlüsselter Anhang mit Signatur"
+
#~ msgid ""
#~ "Internal error in GpgOL.\n"
#~ "Could not find all objects."
@@ -1028,9 +1133,6 @@ msgstr "Klartext"
#~ "@LIST@\n"
#~ "Möchten Sie diese entschlüsseln und abspeichern?"
-#~ msgid "Attachment Decryption"
-#~ msgstr "Entschlüsselung eines Anhangs"
-
#~ msgid "Attachment Encryption Failure"
#~ msgstr "Verschlüsselungsfehler eines Anhangs"
@@ -1061,9 +1163,6 @@ msgstr "Klartext"
#~ msgid "GPG &sign message"
#~ msgstr "Mit GPG unter&schreiben"
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Entschlüsseln und Prüfen der Nachricht."
-
#~ msgid "Open GPG Key Manager"
#~ msgstr "Die GPG Schlüsselverwaltung öffnen"
diff --git a/po/pt.po b/po/pt.po
index cc5f5af..1d81748 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: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\n"
"PO-Revision-Date: 2010-07-18 20:41-0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -43,7 +43,7 @@ msgstr ""
"Por favor usa o botão Desencriptar/Verificar para desencriptar\n"
"a mensagem completa novamente. Depois abre este anexo."
-#: src/common.c:232
+#: src/common.c:269
#, fuzzy
msgid "GpgOL - Save attachment"
msgstr "GpgOL - Gravar anexo desencriptado"
@@ -62,13 +62,15 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
msgid "GpgOL"
msgstr "GpgOL"
@@ -346,8 +348,8 @@ msgstr "Erro ao escrever no stream"
msgid "I/O-Error"
msgstr "I/O-Erro"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
msgid "General"
msgstr "Geral"
@@ -410,7 +412,7 @@ msgstr ""
msgid "This is GpgOL version %s"
msgstr "Esta é a versão do GpgOL %s"
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
msgid "Welcome to GpgOL "
msgstr ""
@@ -707,62 +709,158 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+#, fuzzy
+msgid "Start the Certificate Management Software"
+msgstr "GnuPG Zertifikats&verwaltung"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:547
+#, fuzzy
+msgid "Encrypt the text of the message"
+msgstr "Entschlüsseln und Prüfen der Nachricht."
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+
+#: src/gpgoladdin.cpp:553
+#, fuzzy
+msgid "Add a file as an encrypted attachment"
+msgstr "Apresentar mensagem encriptada como anexo"
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:558
+#, fuzzy
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr "Apresentar mensagem encriptada como anexo"
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:563
+#, fuzzy
+msgid "Decrypt the message"
+msgstr "Entschlüsseln und Prüfen der Nachricht."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+
+#: src/gpgoladdin.cpp:568
+#, fuzzy
+msgid "Add a signature of the message"
+msgstr "Entschlüsseln und Prüfen der Nachricht."
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
#, fuzzy
msgid "Start Certificate Manager"
msgstr "GnuPG Zertifikats&verwaltung"
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
msgid "Textbody"
msgstr ""
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
#, fuzzy
msgid "Encrypt"
msgstr "Encriptação"
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
#, fuzzy
msgid "Decrypt"
msgstr "Entschlüsselung"
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr ""
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr ""
+
+#: src/gpgoladdin.cpp:670
+#, fuzzy
+msgid "Attachments"
+msgstr "Entschlüsselung eines Anhangs"
+
+#: src/gpgoladdin.cpp:671
+#, fuzzy
+msgid "Encrypted file"
+msgstr "Encriptação"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
msgid "Save and decrypt"
msgstr ""
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
#, fuzzy
msgid "Please select text to encrypt."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
msgid "Textbody empty."
msgstr ""
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
#, fuzzy
msgid "Please add at least one recipent."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
#, fuzzy
msgid "Please select a Mail."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
#, fuzzy
msgid "Please select the data you wish to decrypt."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
msgid "Nothing to decrypt."
msgstr ""
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
msgid "Plain text"
msgstr ""
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:1008
+#, fuzzy
+msgid "Select file to encrypt"
+msgstr "Por favor selecciona pelo menos um certificado de destinatário."
+
#, fuzzy
#~ msgid "Decrypt Selection"
#~ msgstr "Entschlüsselung"
@@ -1008,9 +1106,6 @@ msgstr ""
#~ "@LIST@\n"
#~ "Möchten Sie diese entschlüsseln und abspeichern?"
-#~ msgid "Attachment Decryption"
-#~ msgstr "Entschlüsselung eines Anhangs"
-
#~ msgid "Attachment Encryption Failure"
#~ msgstr "Verschlüsselungsfehler eines Anhangs"
@@ -1041,9 +1136,6 @@ msgstr ""
#~ msgid "GPG &sign message"
#~ msgstr "Mit GPG unter&schreiben"
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Entschlüsseln und Prüfen der Nachricht."
-
#~ msgid "Open GPG Key Manager"
#~ msgstr "Die GPG Schlüsselverwaltung öffnen"
diff --git a/po/sv.po b/po/sv.po
index 5f5c367..9a7c5a2 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: 2013-07-15 08:09+0000\n"
+"POT-Creation-Date: 2013-08-13 09:16+0000\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"
@@ -40,7 +40,7 @@ msgid ""
"entire message again. Then open this attachment."
msgstr ""
-#: src/common.c:232
+#: src/common.c:269
#, fuzzy
msgid "GpgOL - Save attachment"
msgstr "GPG - Spara dekrypterad bilaga"
@@ -57,13 +57,15 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
-#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
-#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
-#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
-#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
-#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
-#: src/ribbon-callbacks.cpp:636
+#: src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740 src/gpgoladdin.cpp:745
+#: src/gpgoladdin.cpp:813 src/gpgoladdin.cpp:816 src/ribbon-callbacks.cpp:117
+#: src/ribbon-callbacks.cpp:231 src/ribbon-callbacks.cpp:246
+#: src/ribbon-callbacks.cpp:258 src/ribbon-callbacks.cpp:295
+#: src/ribbon-callbacks.cpp:307 src/ribbon-callbacks.cpp:632
+#: src/ribbon-callbacks.cpp:649 src/ribbon-callbacks.cpp:663
+#: src/ribbon-callbacks.cpp:676 src/ribbon-callbacks.cpp:726
+#: src/ribbon-callbacks.cpp:1002 src/ribbon-callbacks.cpp:1036
+#: src/ribbon-callbacks.cpp:1048 src/ribbon-callbacks.cpp:1073
msgid "GpgOL"
msgstr ""
@@ -328,8 +330,8 @@ msgstr "Fel vid skrivning av fil"
msgid "I/O-Error"
msgstr "In-/Ut-fel"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
-#: src/gpgoladdin.cpp:703
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:663 src/gpgoladdin.cpp:740
+#: src/gpgoladdin.cpp:813
msgid "General"
msgstr ""
@@ -376,7 +378,7 @@ msgstr ""
msgid "This is GpgOL version %s"
msgstr ""
-#: src/olflange.cpp:526
+#: src/olflange.cpp:527
msgid "Welcome to GpgOL "
msgstr ""
@@ -648,62 +650,156 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:541
+#, fuzzy
+msgid "Start the Certificate Management Software"
+msgstr "GPG-nyckel&hanterare"
+
+#: src/gpgoladdin.cpp:543
+msgid ""
+"Open GPA or Kleopatra to manage your certificates. You can use this you to "
+"generate your own certificates. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:547
+#, fuzzy
+msgid "Encrypt the text of the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:549
+msgid ""
+"Choose the certificates for which the message should be encrypted and "
+"replace the text with the encrypted message."
+msgstr ""
+
+#: src/gpgoladdin.cpp:553
+msgid "Add a file as an encrypted attachment"
+msgstr ""
+
+#: src/gpgoladdin.cpp:555
+msgid "Encrypts a file and adds it as an attachment to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:558
+msgid "Add a file as an encrypted attachment with a signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:560
+msgid ""
+"Encrypts a file, signs it and adds both the encrypted file and the signature "
+"as attachments to the message. "
+msgstr ""
+
+#: src/gpgoladdin.cpp:563
+#, fuzzy
+msgid "Decrypt the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:565
+msgid ""
+"Look for PGP or S/MIME encrypted data in the message text and decrypt it."
+msgstr ""
+
+#: src/gpgoladdin.cpp:568
+#, fuzzy
+msgid "Add a signature of the message"
+msgstr "Dekryptera och validera meddelandet."
+
+#: src/gpgoladdin.cpp:570
+msgid ""
+"Appends a signed copy of the message text in an opaque signature. An opaque "
+"signature ensures that the signed text is not modified by embedding it in "
+"the signature itself. The combination of the signed message text and your "
+"signature is added below the plain text. The message will not be encrypted!"
+msgstr ""
+
+#: src/gpgoladdin.cpp:664 src/gpgoladdin.cpp:741 src/gpgoladdin.cpp:814
#, fuzzy
msgid "Start Certificate Manager"
msgstr "GPG-nyckel&hanterare"
-#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+#: src/gpgoladdin.cpp:665 src/gpgoladdin.cpp:742
msgid "Textbody"
msgstr ""
-#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
+#: src/gpgoladdin.cpp:666 src/gpgoladdin.cpp:673
#, fuzzy
msgid "Encrypt"
msgstr "Kryptering"
-#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
-#: src/gpgoladdin.cpp:639
+#: src/gpgoladdin.cpp:667 src/gpgoladdin.cpp:673 src/gpgoladdin.cpp:743
+#: src/gpgoladdin.cpp:746 src/gpgoladdin.cpp:747
#, fuzzy
msgid "Decrypt"
msgstr "Dekryptering"
-#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
+#: src/gpgoladdin.cpp:668
+msgid "Sign"
+msgstr ""
+
+#: src/gpgoladdin.cpp:669 src/gpgoladdin.cpp:744
+msgid "Verify"
+msgstr ""
+
+#: src/gpgoladdin.cpp:670
+#, fuzzy
+msgid "Attachments"
+msgstr "Dekryptering av bilaga"
+
+#: src/gpgoladdin.cpp:671
+#, fuzzy
+msgid "Encrypted file"
+msgstr "Kryptering"
+
+#: src/gpgoladdin.cpp:672
+msgid "Encrypted file and Signature"
+msgstr ""
+
+#: src/gpgoladdin.cpp:745 src/gpgoladdin.cpp:816 src/gpgoladdin.cpp:817
msgid "Save and decrypt"
msgstr ""
-#: src/ribbon-callbacks.cpp:147
+#: src/ribbon-callbacks.cpp:245
#, fuzzy
msgid "Please select text to encrypt."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:160
+#: src/ribbon-callbacks.cpp:257
msgid "Textbody empty."
msgstr ""
-#: src/ribbon-callbacks.cpp:191
+#: src/ribbon-callbacks.cpp:306 src/ribbon-callbacks.cpp:1001
#, fuzzy
msgid "Please add at least one recipent."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:572
+#: src/ribbon-callbacks.cpp:648
#, fuzzy
msgid "Please select a Mail."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:586
+#: src/ribbon-callbacks.cpp:662
#, fuzzy
msgid "Please select the data you wish to decrypt."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:599
+#: src/ribbon-callbacks.cpp:675
msgid "Nothing to decrypt."
msgstr ""
-#: src/ribbon-callbacks.cpp:715
+#: src/ribbon-callbacks.cpp:821
msgid "Plain text"
msgstr ""
+#: src/ribbon-callbacks.cpp:822
+msgid "Signed text"
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:1008
+#, fuzzy
+msgid "Select file to encrypt"
+msgstr "Välj åtminstone en mottagarnyckel."
+
#, fuzzy
#~ msgid "Decrypt Selection"
#~ msgstr "Dekryptering"
@@ -862,9 +958,6 @@ msgstr ""
#~ "@LIST@\n"
#~ "Vill du dekryptera och spara dem?"
-#~ msgid "Attachment Decryption"
-#~ msgstr "Dekryptering av bilaga"
-
#~ msgid "Attachment Encryption Failure"
#~ msgstr "Kryptering av bilaga misslyckades"
@@ -892,8 +985,5 @@ msgstr ""
#~ msgid "GPG &sign message"
#~ msgstr "GPG-&signera meddelandet"
-#~ msgid "Decrypt and verify the message."
-#~ msgstr "Dekryptera och validera meddelandet."
-
#~ msgid "Open GPG Key Manager"
#~ msgstr "Öppna GPG-nyckelhanteraren"
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index c25e246..e24fe85 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -555,7 +555,7 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
_("Encrypts a file and adds it as an attachment to the "
"message. ");
const char *encryptSignFileTTip =
- _("Add a file and it's signature as an encrypted attachment");
+ _("Add a file as an encrypted attachment with a signature");
const char *encryptSignFileSTip =
_("Encrypts a file, signs it and adds both the encrypted file "
"and the signature as attachments to the message. ");
@@ -565,9 +565,9 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
_("Look for PGP or S/MIME encrypted data in the message text "
"and decrypt it.");
const char *signTextTTip =
- _("Add a signature with the embedded message");
+ _("Add a signature of the message");
const char *signTextSTip =
- _("Append a signed copy of the message text in an opaque signature. "
+ _("Appends a signed copy of the message text in an opaque signature. "
"An opaque signature ensures that the signed text is not modified by "
"embedding it in the signature itself. "
"The combination of the signed message text and your signature is "
commit 7f11a04956e10e3c7e3742b852aa5d1b55962b8d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Aug 13 09:00:26 2013 +0000
Ensure sender address for verify
If the message has not been sent use the current sender
address for verification.
* src/ribbon-callbacks.cpp (do_reader_action): Check
for sender address if message was not sent before.
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 22f8e3b..987e46d 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -682,7 +682,18 @@ do_reader_action (LPDISPATCH ctrl, int flags)
fix_linebreaks (encData, &encDataLen);
subject = get_oom_string (mailItem, "Subject");
- senderAddr = get_oom_string (mailItem, "SenderEmailAddress");
+ if (get_oom_bool (mailItem, "Sent"))
+ {
+ senderAddr = get_oom_string (mailItem, "SenderEmailAddress");
+ }
+ else
+ {
+ /* If the message has not been sent we might be composing
+ in this case use the current address */
+ LPDISPATCH sender = get_oom_object (mailItem, "Session.CurrentUser");
+ senderAddr = get_oom_string (sender, "Address");
+ RELDISP (sender);
+ }
/* Determine the protocol based on the content */
protocol = is_cms_data (encData, encDataLen) ? PROTOCOL_SMIME :
commit b86f87156a46376272df9595fd0f38069a06af84
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Aug 13 08:59:31 2013 +0000
Append signature after the message text
Do not replace the text anymore but add the signature below.
* src/ribbon-callbacks.cpp (do_composer_action): Append
signature to body.
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 8fe2715..22f8e3b 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -403,8 +403,22 @@ do_composer_action (LPDISPATCH ctrl, int flags)
}
if (strlen (buffer) > 1)
{
- /* Now replace the selection with the encrypted text */
- if (protocol == PROTOCOL_SMIME)
+ if (flags & OP_SIGN)
+ {
+ /* When signing we append the signature after the body */
+ unsigned int combinedSize = strlen (buffer) +
+ strlen (plaintext) + 5;
+ char combinedBody[combinedSize];
+ memset (combinedBody, 0, combinedSize);
+ snprintf (combinedBody, combinedSize, "%s\r\n\r\n%s", plaintext,
+ buffer);
+ if (flags & DATA_SELECTION)
+ put_oom_string (selection, "Text", combinedBody);
+ else if (flags & DATA_BODY)
+ put_oom_string (mailItem, "Body", combinedBody);
+
+ }
+ else if (protocol == PROTOCOL_SMIME)
{
unsigned int enclosedSize = strlen (buffer) + 34 + 31 + 1;
char enclosedData[enclosedSize];
commit f95945400c04e54a5b7bc0bd83f12d38124431b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Aug 13 08:57:22 2013 +0000
Add ui for verify in composer and Tooltips
* src/gpgoladdin.cpp (getCustomUI): Use tooltips and supertips
to explain some more whats happening.
(getCustomUI): Add verify action to the reader
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 4bb6e22..c25e246 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -536,7 +536,43 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
STDMETHODIMP
GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
{
- wchar_t buffer[4096];
+ wchar_t buffer[8192];
+ const char *certManagerTTip =
+ _("Start the Certificate Management Software");
+ const char *certManagerSTip =
+ _("Open GPA or Kleopatra to manage your certificates. "
+ "You can use this you to generate your "
+ "own certificates. ");
+ const char *encryptTextTTip =
+ _("Encrypt the text of the message");
+ const char *encryptTextSTip =
+ _("Choose the certificates for which the message "
+ "should be encrypted and replace the text "
+ "with the encrypted message.");
+ const char *encryptFileTTip =
+ _("Add a file as an encrypted attachment");
+ const char *encryptFileSTip =
+ _("Encrypts a file and adds it as an attachment to the "
+ "message. ");
+ const char *encryptSignFileTTip =
+ _("Add a file and it's signature as an encrypted attachment");
+ const char *encryptSignFileSTip =
+ _("Encrypts a file, signs it and adds both the encrypted file "
+ "and the signature as attachments to the message. ");
+ const char *decryptTextTTip=
+ _("Decrypt the message");
+ const char *decryptTextSTip =
+ _("Look for PGP or S/MIME encrypted data in the message text "
+ "and decrypt it.");
+ const char *signTextTTip =
+ _("Add a signature with the embedded message");
+ const char *signTextSTip =
+ _("Append a signed copy of the message text in an opaque signature. "
+ "An opaque signature ensures that the signed text is not modified by "
+ "embedding it in the signature itself. "
+ "The combination of the signed message text and your signature is "
+ "added below the plain text. "
+ "The message will not be encrypted!");
memset(buffer, 0, sizeof buffer);
@@ -559,6 +595,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnCertManager\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"startCertManager\"/>"
L" </group>"
L" <group id=\"textGroup\""
@@ -567,17 +605,28 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnEncryptLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"encryptBody\"/>"
L" <button id=\"fullTextDecrypt\""
L" getImage=\"btnDecryptLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"decryptBody\"/>"
L" <button id=\"fullTextSign\""
L" getImage=\"btnSignLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"signBody\"/>"
+ L" <button id=\"fullTextVerify\""
+ L" getImage=\"btnVerifyLarge\""
+ L" size=\"large\""
+ L" label=\"%S\""
+ L" onAction=\"verifyBody\"/>"
L" </group>"
L" <group id=\"attachmentGroup\""
L" label=\"%S\">"
@@ -585,11 +634,15 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnEncryptLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"addEncAttachment\"/>"
L" <button id=\"encryptSignFile\""
L" getImage=\"btnEncryptFileLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"addEncSignedAttachment\"/>"
L" </group>"
L" </tab>"
@@ -608,14 +661,15 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" </contextMenu>"
L"</contextMenus>"
L"</customUI>", _("GpgOL"), _("General"),
- _("Start Certificate Manager"),
+ _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
_("Textbody"),
- _("Encrypt"),
- _("Decrypt"),
- _("Sign"),
+ _("Encrypt"), encryptTextTTip, encryptTextSTip,
+ _("Decrypt"), decryptTextTTip, decryptTextSTip,
+ _("Sign"), signTextTTip, signTextSTip,
+ _("Verify"),
_("Attachments"),
- _("Encrypted file"),
- _("Encrypted file and Signature"),
+ _("Encrypted file"), encryptFileTTip, encryptFileSTip,
+ _("Encrypted file and Signature"), encryptSignFileTTip, encryptSignFileSTip,
_("Encrypt"), _("Decrypt")
);
}
@@ -633,6 +687,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnCertManager\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"startCertManager\"/>"
L" </group>"
L" <group id=\"textGroup\""
@@ -641,6 +697,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnDecryptLarge\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"decryptBody\"/>"
L" <button id=\"fullTextVerify\""
L" getImage=\"btnVerifyLarge\""
@@ -679,8 +737,10 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" </contextMenu>"
L"</contextMenus>"
L"</customUI>",
- _("GpgOL"), _("General"), _("Start Certificate Manager"),
- _("Textbody"), _("Decrypt"),
+ _("GpgOL"), _("General"),
+ _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
+ _("Textbody"),
+ _("Decrypt"), decryptTextTTip, decryptTextSTip,
_("Verify"),
_("GpgOL"), _("Save and decrypt"),
_("Decrypt"),
@@ -700,6 +760,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" getImage=\"btnCertManager\""
L" size=\"large\""
L" label=\"%S\""
+ L" screentip=\"%S\""
+ L" supertip=\"%S\""
L" onAction=\"startCertManager\"/>"
L" </group>"
/* This would be totally nice but Outlook
@@ -748,7 +810,8 @@ GpgolRibbonExtender::GetCustomUI (BSTR RibbonID, BSTR * RibbonXml)
L" </contextMenu>"
L" </contextMenus>"
L"</customUI>",
- _("GpgOL"), _("General"), _("Start Certificate Manager"),
+ _("GpgOL"), _("General"),
+ _("Start Certificate Manager"), certManagerTTip, certManagerSTip,
/*_("Mail Body"), _("Decrypt"),*/
_("GpgOL"), _("Save and decrypt"),/*_("Decrypt"), */
_("Save and decrypt"));
commit 4455aaf2f2274becf5746b38da0a4a0ffb88ce72
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Aug 13 08:56:29 2013 +0000
Statically link against compiler libraries
* src/Makefile.am (gpgol_LDFLAGS): New.
diff --git a/src/Makefile.am b/src/Makefile.am
index 76d1dc6..59ba6cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,6 +116,8 @@ libassuan.a:
clean-local:
rm -f libmapi32.a libgpg-error.a libgpgme.a libassuan.a
+gpgol_LDFLAGS = -static-libgcc -static-libstdc++
+
gpgol_LDADD = $(srcdir)/gpgol.def \
-L . -lgpgme -lassuan -lgpg-error \
-lmapi32 -lshell32 -lgdi32 -lcomdlg32 \
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 163 +++++++++++++++++++++++++++++++++++++---------
po/pt.po | 154 ++++++++++++++++++++++++++++++++++---------
po/sv.po | 152 ++++++++++++++++++++++++++++++++++---------
src/Makefile.am | 2 +
src/gpgoladdin.cpp | 83 +++++++++++++++++++++---
src/ribbon-callbacks.cpp | 31 ++++++++-
6 files changed, 478 insertions(+), 107 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list