[svn] GpgOL - r198 - in trunk: . po src
svn author wk
cvs at cvs.gnupg.org
Mon Nov 12 15:29:43 CET 2007
Author: wk
Date: 2007-11-12 15:29:34 +0100 (Mon, 12 Nov 2007)
New Revision: 198
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/po/de.po
trunk/po/sv.po
trunk/src/engine.c
trunk/src/ext-commands.cpp
trunk/src/olflange-dlgs.cpp
trunk/src/verify-dialog.c
Log:
s,OpenPGP,PGP/MIME,g
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/ChangeLog 2007-11-12 14:29:34 UTC (rev 198)
@@ -1,3 +1,7 @@
+2007-11-12 Werner Koch <wk at g10code.com>
+
+ Released 0.10.2 development version.
+
2007-10-22 Werner Koch <wk at g10code.com>
Released 0.10.1 development version.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/NEWS 2007-11-12 14:29:34 UTC (rev 198)
@@ -1,4 +1,4 @@
-Noteworthy changes for version 0.10.2
+Noteworthy changes for version 0.10.2 (2007-11-12)
==================================================
UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
@@ -7,6 +7,7 @@
* New menu items to select the default protocol.
+ * Code cleanups.
Noteworthy changes for version 0.10.1 (2007-10-22)
==================================================
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/configure.ac 2007-11-12 14:29:34 UTC (rev 198)
@@ -17,7 +17,7 @@
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
m4_define([my_version], [0.10.2])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/po/de.po 2007-11-12 14:29:34 UTC (rev 198)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: GpgOL 0.10.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2007-10-22 17:20+0200\n"
-"PO-Revision-Date: 2007-10-22 17:21+0200\n"
+"POT-Creation-Date: 2007-11-12 15:15+0100\n"
+"PO-Revision-Date: 2007-11-12 15:14+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@
"The user interface server is not available or does not work. Using an "
"internal user interface.\n"
"\n"
-"This is limited to the OpenPGP protocol and thus S/MIME protected message "
+"This is limited to the PGP/MIME protocol and thus S/MIME protected message "
"are not readable."
msgstr ""
"Der Dienst für GpgOLs Benutzerschnittstelle ist nicht verfügbar oder "
@@ -70,7 +70,7 @@
"Diese ist allerdings sehr vereinfacht und kann z.B. keine S/MIME "
"verschlüsselten Nachrichten entschlüsseln."
-#: src/engine.c:367
+#: src/engine.c:367 src/ext-commands.cpp:659 src/main.c:603 src/main.c:609
msgid "GpgOL"
msgstr "GpgOL"
@@ -208,108 +208,146 @@
msgid "*** End Notation ***\n"
msgstr "*** Ende Notation ***\n"
-#: src/ext-commands.cpp:408
+#: src/ext-commands.cpp:427
msgid "&Decrypt and verify message"
msgstr "Entschlüsseln/Prüfen der Nachricht"
-#: src/ext-commands.cpp:409
+#: src/ext-commands.cpp:428
msgid "&Verify signature"
msgstr "&Unterschrift prüfen"
-#: src/ext-commands.cpp:410
+#: src/ext-commands.cpp:429
msgid "&Display crypto information"
msgstr "~Krypto Informationen anzeigen"
-#: src/ext-commands.cpp:417 src/ext-commands.cpp:713
+#: src/ext-commands.cpp:436 src/ext-commands.cpp:787
msgid "Decrypt message and verify signature"
msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
-#: src/ext-commands.cpp:424
-msgid "use S/MIME protocol"
-msgstr "S/MIME verwenden"
+#: src/ext-commands.cpp:443
+msgid ">GnuPG protocol"
+msgstr ">GnuPG Protokoll"
-#: src/ext-commands.cpp:425
+#: src/ext-commands.cpp:444
+msgid "auto"
+msgstr "automatisch"
+
+#: src/ext-commands.cpp:445
+msgid "PGP/MIME"
+msgstr "PGP/MIME"
+
+#: src/ext-commands.cpp:446
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: src/ext-commands.cpp:448
msgid "&encrypt message with GnuPG"
msgstr "Nachricht mit GnuPG verschlüsseln"
-#: src/ext-commands.cpp:426
+#: src/ext-commands.cpp:449
msgid "&sign message with GnuPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:430
+#: src/ext-commands.cpp:453
msgid "Encrypt message with GnuPG"
msgstr "Nachricht mit GnuPG verschlüsseln"
-#: src/ext-commands.cpp:431
+#: src/ext-commands.cpp:454
msgid "Sign message with GnuPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:444
+#: src/ext-commands.cpp:489
msgid "GnuPG Certificate &Manager"
msgstr "GnuPG Zertifikats&verwaltung"
-#: src/ext-commands.cpp:448
+#: src/ext-commands.cpp:493
msgid "Open the certificate manager"
msgstr "Die Zertifikatsverwaltung öffnen"
-#: src/ext-commands.cpp:590
+#: src/ext-commands.cpp:658
msgid "Could not start certificate manager"
msgstr "Die Zertifikatsverwaltung konnte nicht aufgerufen werden"
-#: src/ext-commands.cpp:641
+#: src/ext-commands.cpp:701
msgid "Select this option to decrypt and verify the message."
msgstr ""
"Wählen Sie diese Option um die Nachricht zu entschlüsseln bzw. zu "
"verifizieren."
-#: src/ext-commands.cpp:648
+#: src/ext-commands.cpp:708
msgid "Select this option to show information on the crypto status"
msgstr ""
"Wählen Sie diese Option um Informationen über den Krypto-Status der "
"Nachricht anzuzeigen."
-#: src/ext-commands.cpp:656 src/ext-commands.cpp:732
+#: src/ext-commands.cpp:716 src/ext-commands.cpp:806
msgid "Check the signature now and display the result"
msgstr "Die digitale Unterschrift jetzt prüfen und das Resultat anzeigen"
-#: src/ext-commands.cpp:663
+#: src/ext-commands.cpp:723
+msgid "Select this option to automatically select the protocol."
+msgstr "Wählen Sie diese Option zum das Protokoll automatisch auszuwählen."
+
+#: src/ext-commands.cpp:730
+msgid "Select this option to select the PGP/MIME protocol."
+msgstr "Wählen Sie diese Option zum das PGP/MIME Protokoll auszuwählen."
+
+#: src/ext-commands.cpp:737
msgid "Select this option to select the S/MIME protocol."
msgstr "Wählen Sie diese Option zum das S/MIME Protokoll auszuwählen."
-#: src/ext-commands.cpp:670
+#: src/ext-commands.cpp:744
msgid "Select this option to encrypt the message."
msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
-#: src/ext-commands.cpp:677
+#: src/ext-commands.cpp:751
msgid "Select this option to sign the message."
msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
-#: src/ext-commands.cpp:684
+#: src/ext-commands.cpp:758
msgid "Select this option to open the certificate manager"
msgstr "Wählen Sie diese Option zum die Zertifikatsverwaltung zu öffenen."
-#: src/ext-commands.cpp:722
+#: src/ext-commands.cpp:796
msgid "Show S/MIME status info"
msgstr "S/MIME Status Informationen anzeigen"
-#: src/ext-commands.cpp:742
+#: src/ext-commands.cpp:816
msgid "Use S/MIME for sign/encrypt"
msgstr "S/MIME zum signieren/verschlüsseln verwenden"
-#: src/ext-commands.cpp:752
+#: src/ext-commands.cpp:826
msgid "Encrypt message with GPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:762
+#: src/ext-commands.cpp:836
msgid "Sign message with GPG"
msgstr "Nachricht mit GnuPG unterschreiben"
-#: src/ext-commands.cpp:772
+#: src/ext-commands.cpp:846
msgid "Open the GpgOL certificate manager"
msgstr "Zertifikatsverwaltung von GpgOL öffnen"
-#: src/mapihelp.cpp:1183
+#: src/main.c:602
+#, c-format
+msgid "Note: Using compatibility flags: %s"
+msgstr "Notiz: Diese Kompatibilitätsflags werden verwendet: %s"
+
+#: src/main.c:608
+#, c-format
msgid ""
+"Note: Writing debug logs to\n"
+"\n"
+"\"%s\""
+msgstr ""
+"Notiz: Debug-Logausgaben werden nach\n"
+"\n"
+"\"%s\"\n"
+"\n"
+"geschrieben."
+
+#: src/mapihelp.cpp:1193
+msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
"visible]"
@@ -318,7 +356,7 @@
"Outlook Sitzung entschlüsselt wurde. Verwenden Sie den Menüpunkt "
"\"entschlüsseln/verifizieren\" um den Inhalt wieder sichtbar zu machen.]"
-#: src/mapihelp.cpp:1678
+#: src/mapihelp.cpp:1739
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
@@ -326,7 +364,7 @@
"[Aufgrund eines Verarbeitungsfehlers in GpgOL ist der Inhalt dieser "
"Nachricht nicht sichtbar.]"
-#: src/message-events.cpp:214
+#: src/message-events.cpp:215
msgid ""
"Sorry, we can only encrypt plain text messages and\n"
"no RTF messages. Please make sure that only the text\n"
@@ -337,13 +375,13 @@
"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
"(In der Menüleiste: \"Format\" => \"Nur Text\")"
-#: src/message.cpp:130
+#: src/message.cpp:131
msgid "[Crypto operation failed - can't show the body of the message]"
msgstr ""
"[Krypto-Operation ist fehlgeschlagen - Der Text der Nachricht kann nicht "
"angezeigt werden.]"
-#: src/message.cpp:159
+#: src/message.cpp:220
#, c-format
msgid ""
"Message class: %s\n"
@@ -356,29 +394,29 @@
"Struktur der Nachricht:\n"
"%s"
-#: src/message.cpp:167
+#: src/message.cpp:228
msgid "GpgOL - Message Information"
msgstr "GpgOL - Informationen zu der Nachricht"
-#: src/message.cpp:750
+#: src/message.cpp:814
msgid "No recipients to encrypt to are given"
msgstr "Empfänger zum Verschlüsseln wurde nicht angegeben"
-#: src/message.cpp:766
+#: src/message.cpp:830
#, c-format
msgid "Encryption failed (%s)"
msgstr "Verschlüsselungsfehler (%s)"
-#: src/message.cpp:787
+#: src/message.cpp:851
#, c-format
msgid "Signing failed (%s)"
msgstr "Unterschrifterstellungsfehler (%s)"
-#: src/mimeparser.c:929
+#: src/mimeparser.c:956
msgid "Error writing to stream"
msgstr "Dateischreibfehler"
-#: src/mimeparser.c:930
+#: src/mimeparser.c:957
msgid "I/O-Error"
msgstr "Ein-/Ausgabefehler"
@@ -391,47 +429,51 @@
msgstr "Neue Nachrichten per Voreinstellung signieren"
#: src/olflange-dlgs.cpp:47
+msgid "Use PGP/MIME by default"
+msgstr "PGP/MIME per Voreinstellung verwenden"
+
+#: src/olflange-dlgs.cpp:48
msgid "Use S/MIME by default"
msgstr "S/MIME per Voreinstellung verwenden"
-#: src/olflange-dlgs.cpp:48
+#: src/olflange-dlgs.cpp:49
msgid "Enable the S/MIME support"
msgstr "S/MIME Unterstützung einschalten"
-#: src/olflange-dlgs.cpp:50
+#: src/olflange-dlgs.cpp:51
msgid "Also encrypt message with the default certificate"
msgstr "Nachricht ebenfalls an das voreingestellte Zertifikat verschlüsseln"
-#: src/olflange-dlgs.cpp:51
+#: src/olflange-dlgs.cpp:52
msgid "Also decrypt in preview window"
msgstr "Auch im Vorschaufenster entschlüsseln"
-#: src/olflange-dlgs.cpp:52
+#: src/olflange-dlgs.cpp:53
msgid "Show HTML view if possible"
msgstr "HTML Darstellung anzeigen wenn möglich"
-#: src/olflange-dlgs.cpp:54
+#: src/olflange-dlgs.cpp:55
msgid "Passphrase"
msgstr "Passphrase"
-#: src/olflange-dlgs.cpp:55
+#: src/olflange-dlgs.cpp:56
msgid "Cache &passphrase for"
msgstr "Passphrase speichern für"
-#: src/olflange-dlgs.cpp:56
+#: src/olflange-dlgs.cpp:57
msgid "minutes"
msgstr "Minuten"
-#: src/olflange-dlgs.cpp:58
+#: src/olflange-dlgs.cpp:59
msgid "Ad&vanced.."
msgstr "&Erweitert..."
-#: src/olflange-dlgs.cpp:227
+#: src/olflange-dlgs.cpp:258
msgid "The default certificate may not contain any spaces."
msgstr ""
"Der Bezeichner für das Standardzertifikat darf keine Leerzeichen enthalten."
-#: src/olflange-dlgs.cpp:249
+#: src/olflange-dlgs.cpp:280
msgid ""
"You have enabled GpgOL's support for the S/MIME protocol.\n"
"\n"
@@ -450,11 +492,11 @@
"kann."
#. TRANSLATORS: See the source for the full english text.
-#: src/olflange-dlgs.cpp:292
+#: src/olflange-dlgs.cpp:329
msgid "-#GpgOLFullHelpText#-"
msgstr ""
"GpgOL ist ein Plugin für Microsoft Outlook, welches es ermöglicht\n"
-"Nachrichten mittels der Internet-Standards OpenPGP oder S/MIME\n"
+"Nachrichten mittels der Internet-Standards PGP/MIME oder S/MIME\n"
"zu verschlüsseln und digital zu signieren. Im Hintergrund wird\n"
"dazu die GnuPG Software (<http://www.gnupg.org/>) benutzt.\n"
"Aktuelle Informationen zu GpgOL erhalten Sie durch eine Mausklick\n"
@@ -475,7 +517,7 @@
"Public License erhalten haben. Falls nicht, finden Sie diese\n"
"unter der Webadresse <http://www.gnu.org/licenses/>."
-#: src/olflange-dlgs.cpp:298
+#: src/olflange-dlgs.cpp:335
#, c-format
msgid "This is GpgOL version %s"
msgstr "Dies ist GpgOL Version %s"
@@ -632,13 +674,16 @@
msgstr "auch bekannt als"
#: src/verify-dialog.c:244
-msgid "OpenPGP Verification Result"
-msgstr "OpenPGP Prüfungsresultat"
+msgid "PGP/MIME Verification Result"
+msgstr "PGP/MIME Prüfungsresultat"
#: src/verify-dialog.c:247
msgid "S/MIME Verification Result"
msgstr "S/MIME Prüfungsresultat"
+#~ msgid "use S/MIME protocol"
+#~ msgstr "S/MIME verwenden"
+
#~ msgid "Use the S/MIME protocol"
#~ msgstr "S/MIME Unterstützung einschalten"
Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/po/sv.po 2007-11-12 14:29:34 UTC (rev 198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2007-10-22 17:20+0200\n"
+"POT-Creation-Date: 2007-11-12 15:15+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"
@@ -61,11 +61,11 @@
"The user interface server is not available or does not work. Using an "
"internal user interface.\n"
"\n"
-"This is limited to the OpenPGP protocol and thus S/MIME protected message "
+"This is limited to the PGP/MIME protocol and thus S/MIME protected message "
"are not readable."
msgstr ""
-#: src/engine.c:367
+#: src/engine.c:367 src/ext-commands.cpp:659 src/main.c:603 src/main.c:609
msgid "GpgOL"
msgstr ""
@@ -206,129 +206,165 @@
msgid "*** End Notation ***\n"
msgstr "*** Notation slut ***\n"
-#: src/ext-commands.cpp:408
+#: src/ext-commands.cpp:427
msgid "&Decrypt and verify message"
msgstr "&Dekryptera och validera meddelandet"
-#: src/ext-commands.cpp:409
+#: src/ext-commands.cpp:428
#, fuzzy
msgid "&Verify signature"
msgstr "FELAKTIG signatur!"
-#: src/ext-commands.cpp:410
+#: src/ext-commands.cpp:429
msgid "&Display crypto information"
msgstr ""
-#: src/ext-commands.cpp:417 src/ext-commands.cpp:713
+#: src/ext-commands.cpp:436 src/ext-commands.cpp:787
msgid "Decrypt message and verify signature"
msgstr "Dekryptera meddelandet och validera signaturen"
-#: src/ext-commands.cpp:424
-msgid "use S/MIME protocol"
+#: src/ext-commands.cpp:443
+msgid ">GnuPG protocol"
msgstr ""
-#: src/ext-commands.cpp:425
+#: src/ext-commands.cpp:444
+msgid "auto"
+msgstr ""
+
+#: src/ext-commands.cpp:445
#, fuzzy
+msgid "PGP/MIME"
+msgstr "[PGP/MIME-meddelande]"
+
+#: src/ext-commands.cpp:446
+msgid "S/MIME"
+msgstr ""
+
+#: src/ext-commands.cpp:448
+#, fuzzy
msgid "&encrypt message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:426
+#: src/ext-commands.cpp:449
#, fuzzy
msgid "&sign message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:430
+#: src/ext-commands.cpp:453
#, fuzzy
msgid "Encrypt message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:431
+#: src/ext-commands.cpp:454
#, fuzzy
msgid "Sign message with GnuPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:444
+#: src/ext-commands.cpp:489
#, fuzzy
msgid "GnuPG Certificate &Manager"
msgstr "GPG-nyckel&hanterare"
-#: src/ext-commands.cpp:448
+#: src/ext-commands.cpp:493
msgid "Open the certificate manager"
msgstr ""
-#: src/ext-commands.cpp:590
+#: src/ext-commands.cpp:658
#, fuzzy
msgid "Could not start certificate manager"
msgstr "Kunde inte starta nyckelhanteraren"
-#: src/ext-commands.cpp:641
+#: src/ext-commands.cpp:701
#, fuzzy
msgid "Select this option to decrypt and verify the message."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:648
+#: src/ext-commands.cpp:708
#, fuzzy
msgid "Select this option to show information on the crypto status"
msgstr "Välj det här alternativet för att signera meddelandet."
-#: src/ext-commands.cpp:656 src/ext-commands.cpp:732
+#: src/ext-commands.cpp:716 src/ext-commands.cpp:806
msgid "Check the signature now and display the result"
msgstr ""
-#: src/ext-commands.cpp:663
+#: src/ext-commands.cpp:723
#, fuzzy
+msgid "Select this option to automatically select the protocol."
+msgstr "Välj det här alternativet för att kryptera meddelandet."
+
+#: src/ext-commands.cpp:730
+#, fuzzy
+msgid "Select this option to select the PGP/MIME protocol."
+msgstr "Välj det här alternativet för att kryptera meddelandet."
+
+#: src/ext-commands.cpp:737
+#, fuzzy
msgid "Select this option to select the S/MIME protocol."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:670
+#: src/ext-commands.cpp:744
msgid "Select this option to encrypt the message."
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:677
+#: src/ext-commands.cpp:751
msgid "Select this option to sign the message."
msgstr "Välj det här alternativet för att signera meddelandet."
-#: src/ext-commands.cpp:684
+#: src/ext-commands.cpp:758
#, fuzzy
msgid "Select this option to open the certificate manager"
msgstr "Välj det här alternativet för att kryptera meddelandet."
-#: src/ext-commands.cpp:722
+#: src/ext-commands.cpp:796
msgid "Show S/MIME status info"
msgstr ""
-#: src/ext-commands.cpp:742
+#: src/ext-commands.cpp:816
msgid "Use S/MIME for sign/encrypt"
msgstr ""
-#: src/ext-commands.cpp:752
+#: src/ext-commands.cpp:826
#, fuzzy
msgid "Encrypt message with GPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:762
+#: src/ext-commands.cpp:836
msgid "Sign message with GPG"
msgstr "Signera meddelandet med GPG"
-#: src/ext-commands.cpp:772
+#: src/ext-commands.cpp:846
msgid "Open the GpgOL certificate manager"
msgstr ""
-#: src/mapihelp.cpp:1183
+#: src/main.c:602
+#, c-format
+msgid "Note: Using compatibility flags: %s"
+msgstr ""
+
+#: src/main.c:608
+#, c-format
msgid ""
+"Note: Writing debug logs to\n"
+"\n"
+"\"%s\""
+msgstr ""
+
+#: src/mapihelp.cpp:1193
+msgid ""
"[The content of this message is not visible because it has been decrypted by "
"another Outlook session. Use the \"decrypt/verify\" command to make it "
"visible]"
msgstr ""
-#: src/mapihelp.cpp:1678
+#: src/mapihelp.cpp:1739
msgid ""
"[The content of this message is not visible due to an processing error in "
"GpgOL.]"
msgstr ""
# A bit unclear in the original text
-#: src/message-events.cpp:214
+#: src/message-events.cpp:215
msgid ""
"Sorry, we can only encrypt plain text messages and\n"
"no RTF messages. Please make sure that only the text\n"
@@ -338,11 +374,11 @@
"och inte RTF-meddelanden. Se till att endast textformatet\n"
"har valts i inställningarna."
-#: src/message.cpp:130
+#: src/message.cpp:131
msgid "[Crypto operation failed - can't show the body of the message]"
msgstr ""
-#: src/message.cpp:159
+#: src/message.cpp:220
#, c-format
msgid ""
"Message class: %s\n"
@@ -351,30 +387,30 @@
"%s"
msgstr ""
-#: src/message.cpp:167
+#: src/message.cpp:228
msgid "GpgOL - Message Information"
msgstr ""
-#: src/message.cpp:750
+#: src/message.cpp:814
msgid "No recipients to encrypt to are given"
msgstr ""
-#: src/message.cpp:766
+#: src/message.cpp:830
#, fuzzy, c-format
msgid "Encryption failed (%s)"
msgstr "Kryptering misslyckades"
-#: src/message.cpp:787
+#: src/message.cpp:851
#, fuzzy, c-format
msgid "Signing failed (%s)"
msgstr "Signering misslyckades"
-#: src/mimeparser.c:929
+#: src/mimeparser.c:956
#, fuzzy
msgid "Error writing to stream"
msgstr "Fel vid skrivning av fil"
-#: src/mimeparser.c:930
+#: src/mimeparser.c:957
msgid "I/O-Error"
msgstr "In-/Ut-fel"
@@ -388,48 +424,52 @@
msgstr ""
#: src/olflange-dlgs.cpp:47
+msgid "Use PGP/MIME by default"
+msgstr ""
+
+#: src/olflange-dlgs.cpp:48
msgid "Use S/MIME by default"
msgstr ""
-#: src/olflange-dlgs.cpp:48
+#: src/olflange-dlgs.cpp:49
msgid "Enable the S/MIME support"
msgstr ""
-#: src/olflange-dlgs.cpp:50
+#: src/olflange-dlgs.cpp:51
#, fuzzy
msgid "Also encrypt message with the default certificate"
msgstr "Kryptera meddelandet med GPG"
-#: src/olflange-dlgs.cpp:51
+#: src/olflange-dlgs.cpp:52
msgid "Also decrypt in preview window"
msgstr ""
-#: src/olflange-dlgs.cpp:52
+#: src/olflange-dlgs.cpp:53
msgid "Show HTML view if possible"
msgstr ""
-#: src/olflange-dlgs.cpp:54
+#: src/olflange-dlgs.cpp:55
msgid "Passphrase"
msgstr ""
-#: src/olflange-dlgs.cpp:55
+#: src/olflange-dlgs.cpp:56
msgid "Cache &passphrase for"
msgstr ""
-#: src/olflange-dlgs.cpp:56
+#: src/olflange-dlgs.cpp:57
msgid "minutes"
msgstr ""
-#: src/olflange-dlgs.cpp:58
+#: src/olflange-dlgs.cpp:59
msgid "Ad&vanced.."
msgstr ""
-#: src/olflange-dlgs.cpp:227
+#: src/olflange-dlgs.cpp:258
#, fuzzy
msgid "The default certificate may not contain any spaces."
msgstr "Standardnyckeln får inte innehålla några blanksteg."
-#: src/olflange-dlgs.cpp:249
+#: src/olflange-dlgs.cpp:280
msgid ""
"You have enabled GpgOL's support for the S/MIME protocol.\n"
"\n"
@@ -440,11 +480,11 @@
msgstr ""
#. TRANSLATORS: See the source for the full english text.
-#: src/olflange-dlgs.cpp:292
+#: src/olflange-dlgs.cpp:329
msgid "-#GpgOLFullHelpText#-"
msgstr ""
-#: src/olflange-dlgs.cpp:298
+#: src/olflange-dlgs.cpp:335
#, c-format
msgid "This is GpgOL version %s"
msgstr ""
@@ -608,7 +648,7 @@
#: src/verify-dialog.c:244
#, fuzzy
-msgid "OpenPGP Verification Result"
+msgid "PGP/MIME Verification Result"
msgstr "Resultat från validering"
#: src/verify-dialog.c:247
@@ -616,6 +656,14 @@
msgid "S/MIME Verification Result"
msgstr "Resultat från validering"
+#, fuzzy
+#~ msgid "Select this option to select the OpenPGP protocol."
+#~ msgstr "Välj det här alternativet för att kryptera meddelandet."
+
+#, fuzzy
+#~ msgid "OpenPGP Verification Result"
+#~ msgstr "Resultat från validering"
+
#~ msgid "No valid OpenPGP data found."
#~ msgstr "Inget giltigt OpenPGP-data hittades."
@@ -713,9 +761,6 @@
#~ msgid "Attachment Signing Failure"
#~ msgstr "Signering av bilaga misslyckades"
-#~ msgid "[PGP/MIME message]"
-#~ msgstr "[PGP/MIME-meddelande]"
-
#~ msgid "[PGP/MIME message without plain text body]"
#~ msgstr "[PGP/MIME-meddelande utan vanlig meddelandetext]"
Modified: trunk/src/engine.c
===================================================================
--- trunk/src/engine.c 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/src/engine.c 2007-11-12 14:29:34 UTC (rev 198)
@@ -362,7 +362,7 @@
MessageBox (NULL,
_("The user interface server is not available or does "
"not work. Using an internal user interface.\n\n"
- "This is limited to the OpenPGP protocol and "
+ "This is limited to the PGP/MIME protocol and "
"thus S/MIME protected message are not readable."),
_("GpgOL"), MB_ICONWARNING|MB_OK);
err = op_gpgme_init ();
Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/src/ext-commands.cpp 2007-11-12 14:29:34 UTC (rev 198)
@@ -442,7 +442,7 @@
"@", NULL,
_(">GnuPG protocol"), NULL,
_("auto"), &m_nCmdProtoAuto,
- _("OpenPGP"),&m_nCmdProtoPgpmime,
+ _("PGP/MIME"),&m_nCmdProtoPgpmime,
_("S/MIME"), &m_nCmdProtoSmime,
"<", NULL,
_("&encrypt message with GnuPG"), &m_nCmdEncrypt,
@@ -727,7 +727,7 @@
&& m_lContext == EECONTEXT_SENDNOTEMESSAGE)
{
MessageBox (m_hWnd,
- _("Select this option to select the OpenPGP protocol."),
+ _("Select this option to select the PGP/MIME protocol."),
"GpgOL", MB_OK);
}
else if (nCommandID == m_nCmdProtoSmime
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/src/olflange-dlgs.cpp 2007-11-12 14:29:34 UTC (rev 198)
@@ -44,7 +44,7 @@
static struct { int itemid; const char *label; } labels[] = {
{ IDC_ENCRYPT_DEFAULT, N_("&Encrypt new messages by default")},
{ IDC_SIGN_DEFAULT, N_("&Sign new messages by default")},
- { IDC_OPENPGP_DEFAULT, N_("Use OPENPGP by default")},
+ { IDC_OPENPGP_DEFAULT, N_("Use PGP/MIME by default")},
{ IDC_SMIME_DEFAULT, N_("Use S/MIME by default")},
{ IDC_ENABLE_SMIME, N_("Enable the S/MIME support")},
{ IDC_ENCRYPT_WITH_STANDARD_KEY,
Modified: trunk/src/verify-dialog.c
===================================================================
--- trunk/src/verify-dialog.c 2007-11-12 14:19:00 UTC (rev 197)
+++ trunk/src/verify-dialog.c 2007-11-12 14:29:34 UTC (rev 198)
@@ -241,7 +241,7 @@
switch (ctx->protocol)
{
case GPGME_PROTOCOL_OpenPGP:
- s = _("OpenPGP Verification Result");
+ s = _("PGP/MIME Verification Result");
break;
case GPGME_PROTOCOL_CMS:
s = _("S/MIME Verification Result");
More information about the Gnupg-commits
mailing list