[svn] GpgOL - r193 - in trunk: . po src
svn author wk
cvs at cvs.gnupg.org
Fri Oct 12 21:22:45 CEST 2007
Author: wk
Date: 2007-10-12 21:22:35 +0200 (Fri, 12 Oct 2007)
New Revision: 193
Added:
trunk/src/dialogs.h
trunk/src/dialogs.rc
Removed:
trunk/src/gpgol-rsrcs.rc
trunk/src/olflange-ids.h
trunk/src/olflange-rsrcs.rc
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
trunk/po/POTFILES.in
trunk/po/de.po
trunk/po/sv.po
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/common.c
trunk/src/config-dialog.c
trunk/src/engine-gpgme.c
trunk/src/ext-commands.cpp
trunk/src/message-events.cpp
trunk/src/ol-ext-callback.cpp
trunk/src/olflange-dlgs.cpp
trunk/src/olflange.cpp
trunk/src/passphrase-dialog.c
trunk/src/property-sheets.cpp
trunk/src/recipient-dialog.c
trunk/src/resource.rc
trunk/src/verify-dialog.c
Log:
Revamped the i18n support.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/ChangeLog 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,3 +1,7 @@
+2007-10-12 Werner Koch <wk at g10code.com>
+
+ * po/POTFILES.in: Add more files.
+
2007-10-11 Werner Koch <wk at g10code.com>
Released 0.10.0 development version.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/NEWS 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,8 +1,12 @@
-Noteworthy changes for version 0.10.0 (2007-10-11)
+Noteworthy changes for version 0.10.1
==================================================
UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
+
+Noteworthy changes for version 0.10.0 (2007-10-11)
+==================================================
+
* Basically a complete rewrite. A lot of things are still missing but
if might be useful to see the direction the development takes.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/configure.ac 2007-10-12 19:22:35 UTC (rev 193)
@@ -16,8 +16,8 @@
# Remember to change the version number immediately *after* a release.
# 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.0])
-m4_define([my_issvn], [no])
+m4_define([my_version], [0.10.1])
+m4_define([my_issvn], [yes])
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/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/po/POTFILES.in 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,9 +1,17 @@
+src/attached-file-events.cpp
src/common.c
src/config-dialog.c
src/display.cpp
+src/engine.c
src/engine-gpgme.c
+src/engine-assuan.c
+src/ext-commands.cpp
src/main.c
+src/mapihelp.cpp
+src/message-events.cpp
+src/message.cpp
+src/mimeparser.c
src/msgcache.c
src/olflange-dlgs.cpp
src/olflange.cpp
@@ -11,7 +19,5 @@
src/passphrase-dialog.c
src/recipient-dialog.c
src/rfc822parse.c
-src/vasprintf.c
src/verify-dialog.c
src/w32-gettext.c
-
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/po/de.po 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,27 +1,52 @@
-# de.po - German translation for GPGol
-# Copyright (C) 2005 g10 Code GmbH
-# This file is distributed under the same license as the GPGol package.
-# Werner Koch <wk at gnupg.org>, 2005.
+# de.po - German translation for GpgOL
+# Copyright (C) 2005, 2007 g10 Code GmbH
+# This file is distributed under the same license as the GpgOL package.
+# Werner Koch <wk at gnupg.org>, 2005, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: GPGol 0.9.4\n"
+"Project-Id-Version: GpgOL 0.10.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2007-10-11 20:39+0200\n"
-"PO-Revision-Date: 2007-10-11 18:26+0200\n"
+"POT-Creation-Date: 2007-10-12 21:12+0200\n"
+"PO-Revision-Date: 2007-10-12 21:12+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: src/attached-file-events.cpp:58
+msgid "Error creating file for attachment."
+msgstr "Fehler bei der Erstellung der Datei für das Attachment."
+
+#: src/attached-file-events.cpp:71
+msgid "Error reading attachment."
+msgstr "Fehler beim Lesen des Attachments."
+
+#: src/attached-file-events.cpp:82 src/attached-file-events.cpp:95
+msgid "Error writing attachment."
+msgstr "Fehler beim Schreiben des Attachments."
+
+#: src/attached-file-events.cpp:216
+msgid ""
+"Sorry, we are not able to decrypt this attachment.\n"
+"\n"
+"Please use the decrypt/verify button to decrypt the\n"
+"entire message again. Then open this attachment."
+msgstr ""
+"Es ist leider nicht mehr möglich, diese Attachment zu öffnen.\n"
+"\n"
+"Bitten benutzen Sie den \"Entschlüsseln/Verifizieren\" Menüpunkt\n"
+"um die gesamte Nachricht nochmal zu entschlüsseln. Danach können\n"
+"Sie das Attachment wieder öffenen."
+
#: src/common.c:145
-msgid "GPG - Save decrypted attachment"
-msgstr "GPG - Sichern der entschlüsselten Anlage"
+msgid "GpgOL - Save decrypted attachment"
+msgstr "GpgOL - Sichern der entschlüsselten Anlage"
#: src/config-dialog.c:270
-msgid "Path to key-manager binary"
-msgstr "Dateiname der Schlüsselverwaltung"
+msgid "Path to certificate manager binary"
+msgstr "Dateiname der Zertifikatsverwaltung"
#: src/config-dialog.c:271
msgid "Debug output (for analysing problems)"
@@ -31,18 +56,36 @@
msgid "Select GPG Key Manager"
msgstr "Das Schlüsselverwaltungsprogramm festlegen"
+#: src/engine.c:363
+msgid ""
+"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 "
+"are not readable."
+msgstr ""
+"Der Dienst für GpgOLs Benutzerschnittstelle ist nicht verfügbar oder "
+"arbeitet nicht. Eine interne Benutzerschnittstelle wird verwendet.\n"
+"\n"
+"Diese ist allerdings sehr vereinfacht und kann z.B. keine S/MIME "
+"verschlüsselten Nachrichten entschlüsseln."
+
+#: src/engine.c:367
+msgid "GpgOL"
+msgstr "GpgOL"
+
#: src/engine-gpgme.c:354
msgid ""
-"The configured default encryption key is not available or does not "
-"unambigiously specify a key. Please fix this in the option dialog.\n"
+"The configured default encryption certificate is not available or does not "
+"unambigiously specify one. Please fix this in the option dialog.\n"
"\n"
-"This message won't be be encrypted to this key!"
+"This message won't be be encrypted to this certificate!"
msgstr ""
-"Der voreingestellte zusätzliche Schlüssel zum Verschlüsseln ist nicht\n"
+"Das voreingestellte zusätzliche Zertifikat zum Verschlüsseln ist nicht\n"
"vorhanden oder nicht eindeutig. Bitte beheben Sie dies in den\n"
"Optionseinstellungen.\n"
"\n"
-"Die Nachricht wird deswegen nicht für diesen Schlüssel verschlüsselt!"
+"Die Nachricht wird deswegen nicht für dieses Zertifikat verschlüsselt!"
#: src/engine-gpgme.c:358
msgid "Encryption"
@@ -65,27 +108,27 @@
msgstr "Status der Unterschrift ist \"rot\"\n"
#: src/engine-gpgme.c:829
-msgid "Warning: One of the keys has been revoked\n"
-msgstr "Warnung: Einer der Schlüssel wurde widerrufen\n"
+msgid "Warning: One of the certificates has been revoked\n"
+msgstr "Warnung: Eines der Zertifikate wurde widerrufen\n"
#: src/engine-gpgme.c:839
-msgid "Warning: The key used to create the signature expired at: "
+msgid "Warning: The certificate used to create the signature expired at: "
msgstr ""
-"Warnung: Der Schlüssel mit der diese Unterschrift erzeugt wurde verfiel am: "
+"Warnung: Das Zertifikat mit der diese Unterschrift erzeugt wurde verfiel am: "
#: src/engine-gpgme.c:845
-msgid "Warning: At least one certification key has expired\n"
+msgid "Warning: At least one certification certificate has expired\n"
msgstr ""
-"Warnung: Mindestens einer der Zertifizierungsschlüssel ist abgelaufen\n"
+"Warnung: Mindestens eines der Zertifizierungs-Zertifikate ist abgelaufen\n"
#: src/engine-gpgme.c:851
msgid "Warning: The signature expired at: "
msgstr "Die Unterschrift verfiel am: "
#: src/engine-gpgme.c:857
-msgid "Can't verify due to a missing key or certificate\n"
+msgid "Can't verify due to a missing certificate\n"
msgstr ""
-"Aufrund eines fehlenden Schlüssels ist eine Überprüfung nicht möglich\n"
+"Aufrund eines fehlenden Zertifikats ist eine Überprüfung nicht möglich\n"
#: src/engine-gpgme.c:861
msgid "The CRL is not available\n"
@@ -105,23 +148,24 @@
#: src/engine-gpgme.c:915
msgid ""
-"WARNING: We have NO indication whether the key belongs to the person named "
-"as shown above\n"
+"WARNING: We have NO indication whether this certificate belongs to the "
+"person named as shown above\n"
msgstr ""
-"WARNUNG: Es gibt keinen Hinweis darauf, ob der Schlüssel wirklich der Person "
-"gehört, die oben angezeigt ist\n"
+"WARNUNG: Es gibt keinen Hinweis darauf, ob dieses Zertifikat wirklich der "
+"Person gehört, die oben angezeigt ist\n"
#: src/engine-gpgme.c:922
-msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgid ""
+"WARNING: The certificate does NOT BELONG to the person named as shown above\n"
msgstr ""
-"WARNUNG: Der Schlüssel gehört NICHT der Person die oben angezeigt ist\n"
+"WARNUNG: Das Zertifikat gehört NICHT der Person die oben angezeigt ist\n"
#: src/engine-gpgme.c:926
msgid ""
-"WARNING: It is NOT certain that the key belongs to the person named as shown "
-"above\n"
+"WARNING: It is NOT certain that the certificate belongs to the person named "
+"as shown above\n"
msgstr ""
-"WARNING: Es ist nicht sicher, daß der Schlüssel der Person gehört, die oben "
+"WARNING: Es ist nicht sicher, daß das Zertifikat der Person gehört, die oben "
"angezeigt ist\n"
#: src/engine-gpgme.c:959
@@ -164,6 +208,176 @@
msgid "*** End Notation ***\n"
msgstr "*** Ende Notation ***\n"
+#: src/ext-commands.cpp:325
+msgid "&Decrypt and verify message"
+msgstr "Entschlüsseln/Prüfen der Nachricht"
+
+#: src/ext-commands.cpp:326
+msgid "&Verify signature"
+msgstr "&Unterschrift prüfen"
+
+#: src/ext-commands.cpp:327
+msgid "&Display crypto information"
+msgstr "~Krypto Informationen anzeigen"
+
+#: src/ext-commands.cpp:353
+msgid "use S/MIME protocol"
+msgstr "S/MIME verwenden"
+
+#: src/ext-commands.cpp:354
+msgid "&encrypt message with GnuPG"
+msgstr "Nachricht mit GnuPG verschlüsseln"
+
+#: src/ext-commands.cpp:355
+msgid "&sign message with GnuPG"
+msgstr "Nachricht mit GnuPG unterschreiben"
+
+#: src/ext-commands.cpp:397
+msgid "GnuPG Certificate &Manager"
+msgstr "GnuPG Zertifikats&verwaltung"
+
+#: src/ext-commands.cpp:548
+msgid "Could not start certificate manager"
+msgstr "Die Zertifikatsverwaltung konnte nicht aufgerufen werden"
+
+#: src/ext-commands.cpp:595
+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:602
+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:610 src/ext-commands.cpp:686
+msgid "Check the signature now and display the result"
+msgstr "Die digitale Unterschrift jetzt prüfen und das Resultat anzeigen"
+
+#: src/ext-commands.cpp:617
+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:624
+msgid "Select this option to encrypt the message."
+msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
+
+#: src/ext-commands.cpp:631
+msgid "Select this option to sign the message."
+msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
+
+#: src/ext-commands.cpp:638
+msgid "Select this option to open the certificate manager"
+msgstr "Wählen Sie diese Option zum die Zertifikatsverwaltung zu öffenen."
+
+#: src/ext-commands.cpp:667 src/ext-commands.cpp:761
+msgid "Decrypt message and verify signature"
+msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
+
+#: src/ext-commands.cpp:676
+msgid "Show S/MIME status info"
+msgstr "S/MIME Status Informationen anzeigen"
+
+#: src/ext-commands.cpp:696
+msgid "Use S/MIME for sign/encrypt"
+msgstr "S/MIME zum signieren/verschlüsseln verwenden"
+
+#: src/ext-commands.cpp:706 src/ext-commands.cpp:775
+msgid "Encrypt message with GPG"
+msgstr "Nachricht mit GnuPG unterschreiben"
+
+#: src/ext-commands.cpp:716 src/ext-commands.cpp:789
+msgid "Sign message with GPG"
+msgstr "Nachricht mit GnuPG unterschreiben"
+
+#: src/ext-commands.cpp:726
+msgid "Open the GpgOL certificate manager"
+msgstr "Zertifikatsverwaltung von GpgOL öffnen"
+
+#: src/ext-commands.cpp:803
+msgid "Use the S/MIME protocol"
+msgstr "S/MIME Unterstützung einschalten"
+
+#: src/ext-commands.cpp:815
+msgid "Open the certificate manager"
+msgstr "Die Zertifikatsverwaltung öffnen"
+
+#: src/mapihelp.cpp:1183
+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 ""
+"[Der Inhalt dieser Nachricht ist nicht sichtbar, da sie in einer anderen "
+"Outlook Sitzung entschlüsselt wurde. Verwenden Sie den Menüpunkt "
+"\"entschlüsseln/verifizieren\" um den Inhalt wieder sichtbar zu machen.]"
+
+#: src/mapihelp.cpp:1678
+msgid ""
+"[The content of this message is not visible due to an processing error in "
+"GpgOL.]"
+msgstr ""
+"[Aufgrund eines Verarbeitungsfehlers in GpgOL ist der Inhalt dieser "
+"Nachricht nicht sichtbar.]"
+
+#: src/message-events.cpp:214
+msgid ""
+"Sorry, we can only encrypt plain text messages and\n"
+"no RTF messages. Please make sure that only the text\n"
+"format has been selected."
+msgstr ""
+"Leider ist es nur möglich reine Textnachrichten aber keine\n"
+"Nachrichten im RTF Format zu verschlüsseln. Bitte stellen \n"
+"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
+"(In der Menüleiste: \"Format\" => \"Nur Text\")"
+
+#: src/message.cpp:130
+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
+#, c-format
+msgid ""
+"Message class: %s\n"
+"Sig Status : %s\n"
+"Structure of the message:\n"
+"%s"
+msgstr ""
+"Nachrichtenklasse: %s\n"
+"Signatur-Status: %s\n"
+"Struktur der Nachricht:\n"
+"%s"
+
+#: src/message.cpp:167
+msgid "GpgOL - Message Information"
+msgstr "GpgOL - Informationen zu der Nachricht"
+
+#: src/message.cpp:750
+msgid "No recipients to encrypt to are given"
+msgstr "Empfänger zum Verschlüsseln wurde nicht angegeben"
+
+#: src/message.cpp:766
+#, c-format
+msgid "Encryption failed (%s)"
+msgstr "Verschlüsselungsfehler (%s)"
+
+#: src/message.cpp:787
+#, c-format
+msgid "Signing failed (%s)"
+msgstr "Unterschrifterstellungsfehler (%s)"
+
+#: src/mimeparser.c:929
+msgid "Error writing to stream"
+msgstr "Dateischreibfehler"
+
+#: src/mimeparser.c:930
+msgid "I/O-Error"
+msgstr "Ein-/Ausgabefehler"
+
#: src/olflange-dlgs.cpp:45
msgid "&Encrypt new messages by default"
msgstr "Neue Nachrichten per Voreinstellung verschlüsseln"
@@ -181,8 +395,8 @@
msgstr "S/MIME Unterstützung einschalten"
#: src/olflange-dlgs.cpp:50
-msgid "Also encrypt message with the &default key"
-msgstr "Nachricht ebenfalls mit voreingestellten Schlüssel verschlüsseln"
+msgid "Also encrypt message with the default certificate"
+msgstr "Nachricht ebenfalls an das voreingestellte Zertifikat verschlüsseln"
#: src/olflange-dlgs.cpp:51
msgid "Also decrypt in preview window"
@@ -209,8 +423,9 @@
msgstr "&Erweitert..."
#: src/olflange-dlgs.cpp:222
-msgid "The default key may not contain any spaces."
-msgstr "Der Standardschlüssel darf keine Leerzeichen enthalten."
+msgid "The default certificate may not contain any spaces."
+msgstr ""
+"Der Bezeichner für das Standardzertifikat darf keine Leerzeichen enthalten."
#: src/olflange-dlgs.cpp:244
msgid ""
@@ -261,7 +476,7 @@
msgid "This is GpgOL version %s"
msgstr "Dies ist GpgOL Version %s"
-#: src/olflange.cpp:484
+#: src/olflange.cpp:483
msgid ""
"This version of Outlook is too old!\n"
"\n"
@@ -278,43 +493,68 @@
"\n"
"Bitte updaten Sie auf SP2 bevor Sie versuchen eine Nachricht zu versenden."
-#: src/passphrase-dialog.c:83
-msgid "No key hint given."
-msgstr "Kein Hinweis auf den Schlüssel"
+#: src/passphrase-dialog.c:85
+msgid "No certificate hint given."
+msgstr "Kein Hinweis auf das Zertifikat"
-#: src/passphrase-dialog.c:328 src/passphrase-dialog.c:456
+#: src/passphrase-dialog.c:313 src/passphrase-dialog.c:464
+msgid "Enter passphrase to unlock the secret key"
+msgstr "Passphrase um geheimen Schlüssel zu entsperren"
+
+#: src/passphrase-dialog.c:314 src/passphrase-dialog.c:465
+msgid "Hide typing"
+msgstr "&Eingabe ausblenden"
+
+#: src/passphrase-dialog.c:315 src/passphrase-dialog.c:466
+#: src/recipient-dialog.c:385
+msgid "&Cancel"
+msgstr "&Abbrechen"
+
+#: src/passphrase-dialog.c:350 src/passphrase-dialog.c:499
msgid "Invalid passphrase; please try again..."
msgstr "Ungültige Passphrase; bitte nochmal versuchen..."
-#: src/passphrase-dialog.c:355
+#: src/passphrase-dialog.c:379
msgid "Select Signing Key"
msgstr "Signaturschlüssel auswählen"
-#: src/recipient-dialog.c:87
+#: src/passphrase-dialog.c:463
+msgid "Encrypted to the following certificates:"
+msgstr "Verschlüsselt für diese Zertifikate:"
+
+#: src/recipient-dialog.c:88
msgid "Name"
msgstr "Name"
-#: src/recipient-dialog.c:92
+#: src/recipient-dialog.c:93
msgid "E-Mail"
msgstr "E-Mail"
-#: src/recipient-dialog.c:97
+#: src/recipient-dialog.c:98
msgid "Key-Info"
msgstr "Key-Info"
-#: src/recipient-dialog.c:102
+#: src/recipient-dialog.c:103
msgid "Key ID"
msgstr "Key-ID"
-#: src/recipient-dialog.c:107
+#: src/recipient-dialog.c:108
msgid "Validity"
msgstr "Gültigkeit"
-#: src/recipient-dialog.c:423
-msgid "Please select at least one recipient key."
-msgstr "Bitte wählen Sie mindestens einen Empfängerschlüssel."
+#: src/recipient-dialog.c:383
+msgid "Selected recipients:"
+msgstr "Ausgewählte Empfänger:"
-#: src/recipient-dialog.c:424
+#: src/recipient-dialog.c:384
+msgid "Recipient which were NOT found"
+msgstr "Empfänger die NICHT gefunden wurden:"
+
+#: src/recipient-dialog.c:444
+msgid "Please select at least one recipient certificate."
+msgstr "Bitte wählen Sie mindestens ein Empfängerzertifikat."
+
+#: src/recipient-dialog.c:445
msgid "Recipient Dialog"
msgstr "Auswahl des Empfängerschlüssels"
@@ -327,20 +567,20 @@
msgstr "Korrekte Unterschrift"
#: src/verify-dialog.c:128
-msgid "Good signature from revoked key"
-msgstr "Korrekte Unterschrift; aber Schlüssel wurde widerrufen"
+msgid "Good signature from revoked certificate"
+msgstr "Korrekte Unterschrift; aber Zertifikat wurde widerrufen"
#: src/verify-dialog.c:130
-msgid "Good signature from expired key"
-msgstr "Korrekte Unterschrift; allerdings ist der Schlüssel abgelaufen"
+msgid "Good signature from expired certificate"
+msgstr "Korrekte Unterschrift; allerdings ist das Zertifikat abgelaufen"
#: src/verify-dialog.c:132
msgid "Good expired signature"
msgstr "Korrekte aber abgelaufene Unterschrift"
#: src/verify-dialog.c:135
-msgid "Could not check signature: missing key"
-msgstr "Unterschrift konnte nicht geprüft werden: Schlüssel fehlt"
+msgid "Could not check signature: missing certificate"
+msgstr "Unterschrift konnte nicht geprüft werden: Zertifikat fehlt"
#: src/verify-dialog.c:139
msgid "Verification error"
@@ -360,21 +600,44 @@
msgstr "Unterschrift abgelaufen am %s"
#: src/verify-dialog.c:186
-msgid "Signature issued by a key we do NOT trust."
-msgstr "Die Unterschrift stammt von einem Schlüssel dem wir NICHT vertrauen."
+msgid "Signature issued by a certificate we do NOT trust."
+msgstr "Die Unterschrift stammt von einem Zertifikat dem wir NICHT vertrauen."
#: src/verify-dialog.c:193
-msgid "Signature issued by a non-valid key."
-msgstr "Die Unterschrift stammt von einem ungültigen Schlüssel."
+msgid "Signature issued by a non-valid certificate."
+msgstr "Die Unterschrift stammt von einem ungültigen Zertifikat."
-#: src/verify-dialog.c:220
+#: src/verify-dialog.c:209
+msgid "Signature made"
+msgstr "Signatur erstellt"
+
+#: src/verify-dialog.c:210
+msgid "using"
+msgstr "mit"
+
+#: src/verify-dialog.c:211
+msgid "cert-ID"
+msgstr "Key-Id"
+
+#: src/verify-dialog.c:212
+msgid "from"
+msgstr "von"
+
+#: src/verify-dialog.c:213
+msgid "also known as"
+msgstr "auch bekannt als"
+
+#: src/verify-dialog.c:244
msgid "OpenPGP Verification Result"
msgstr "OpenPGP Prüfungsresultat"
-#: src/verify-dialog.c:223
+#: src/verify-dialog.c:247
msgid "S/MIME Verification Result"
msgstr "S/MIME Prüfungsresultat"
+#~ msgid "Debug-1 (open_inspector)"
+#~ msgstr "Debug-1 (Inspektor Fenster öffnen)"
+
#~ msgid "No valid OpenPGP data found."
#~ msgstr "Keine gültigen OpenPGP Daten gefunden"
@@ -459,12 +722,6 @@
#~ msgid "Attachment Decryption"
#~ msgstr "Entschlüsselung eines Anhangs"
-#~ msgid "Signing Failure"
-#~ msgstr "Unterschrifterstellungsfehler"
-
-#~ msgid "Encryption Failure"
-#~ msgstr "Verschlüsselungsfehler"
-
#~ msgid "Attachment Encryption Failure"
#~ msgstr "Verschlüsselungsfehler eines Anhangs"
@@ -477,19 +734,6 @@
#~ msgid "Attachment Signing Failure"
#~ msgstr "Unterschrifterstellungsfehler eines Anhangs"
-#~ msgid ""
-#~ "Error creating file\n"
-#~ "Please select another one"
-#~ msgstr ""
-#~ "Fehler bei der Erstellung der Datei.\n"
-#~ "Bitte wählen Sie eine anderen Namen."
-
-#~ msgid "I/O-Error"
-#~ msgstr "Ein-/Ausgabefehler"
-
-#~ msgid "Error writing file"
-#~ msgstr "Dateischreibfehler"
-
#~ msgid "[PGP/MIME message]"
#~ msgstr "[PGP/MIME Nachricht]"
@@ -502,49 +746,18 @@
#~ msgid "[PGP/MIME signature]"
#~ msgstr "[PGP/MIME Signatur]"
-#~ msgid ""
-#~ "Sorry, we can only encrypt plain text messages and\n"
-#~ "no RTF messages. Please make sure that only the text\n"
-#~ "format has been selected."
-#~ msgstr ""
-#~ "Leider ist es nur möglich reine Textnachrichten aber keine\n"
-#~ "Nachrichten im RTF Format zu verschlüsseln. Bitte stellen \n"
-#~ "Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
-#~ "(In der Menüleiste: \"Format\" => \"Nur Text\")"
-
-#~ msgid "&Decrypt and verify message"
-#~ msgstr "Entschlüsseln/Prüfen der Nachricht"
-
#~ msgid "GPG &encrypt message"
#~ msgstr "Mit GPG &verschlüsseln"
#~ msgid "GPG &sign message"
#~ msgstr "Mit GPG unter&schreiben"
-#~ msgid "GPG Key &Manager"
-#~ msgstr "GPG Schlüssel&verwaltung"
-
-#~ msgid "Could not start Key-Manager"
-#~ msgstr "Dei Schlüsselverwaltung konnte nicht aufgerufen werden"
-
#~ msgid "Decrypt and verify the message."
#~ msgstr "Entschlüsseln und Prüfen der Nachricht."
-#~ msgid "Select this option to encrypt the message."
-#~ msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
-
-#~ msgid "Select this option to sign the message."
-#~ msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
-
#~ msgid "Open GPG Key Manager"
#~ msgstr "Die GPG Schlüsselverwaltung öffnen"
-#~ msgid "Decrypt message and verify signature"
-#~ msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
-
-#~ msgid "Sign message with GPG"
-#~ msgstr "Nachricht mit GPG unterschreiben"
-
#~ msgid ""
#~ "If you cancel this dialog, the message will be sent in cleartext!\n"
#~ "\n"
Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/po/sv.po 2007-10-12 19:22:35 UTC (rev 193)
@@ -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-11 20:39+0200\n"
+"POT-Creation-Date: 2007-10-12 21:12+0200\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,12 +15,37 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: src/attached-file-events.cpp:58
+#, fuzzy
+msgid "Error creating file for attachment."
+msgstr ""
+"Fel vid skapande av fil\n"
+"Välj en annan"
+
+#: src/attached-file-events.cpp:71
+msgid "Error reading attachment."
+msgstr ""
+
+#: src/attached-file-events.cpp:82 src/attached-file-events.cpp:95
+#, fuzzy
+msgid "Error writing attachment."
+msgstr "Fel vid skrivning av fil"
+
+#: src/attached-file-events.cpp:216
+msgid ""
+"Sorry, we are not able to decrypt this attachment.\n"
+"\n"
+"Please use the decrypt/verify button to decrypt the\n"
+"entire message again. Then open this attachment."
+msgstr ""
+
#: src/common.c:145
-msgid "GPG - Save decrypted attachment"
+#, fuzzy
+msgid "GpgOL - Save decrypted attachment"
msgstr "GPG - Spara dekrypterad bilaga"
#: src/config-dialog.c:270
-msgid "Path to key-manager binary"
+msgid "Path to certificate manager binary"
msgstr ""
#: src/config-dialog.c:271
@@ -31,12 +56,26 @@
msgid "Select GPG Key Manager"
msgstr "Välj GPG-nyckelhanterare"
+#: src/engine.c:363
+msgid ""
+"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 "
+"are not readable."
+msgstr ""
+
+#: src/engine.c:367
+msgid "GpgOL"
+msgstr ""
+
#: src/engine-gpgme.c:354
+#, fuzzy
msgid ""
-"The configured default encryption key is not available or does not "
-"unambigiously specify a key. Please fix this in the option dialog.\n"
+"The configured default encryption certificate is not available or does not "
+"unambigiously specify one. Please fix this in the option dialog.\n"
"\n"
-"This message won't be be encrypted to this key!"
+"This message won't be be encrypted to this certificate!"
msgstr ""
"Den konfigurerade standardkrypteringsnyckeln är inte tillgänglig eller anger "
"inte uttryckligen en nyckel. Rätta till det här i inställningarna.\n"
@@ -64,15 +103,18 @@
msgstr "signaturens tillstånd är \"röd\"\n"
#: src/engine-gpgme.c:829
-msgid "Warning: One of the keys has been revoked\n"
+#, fuzzy
+msgid "Warning: One of the certificates has been revoked\n"
msgstr "Varning: En av nycklarna har spärrats\n"
#: src/engine-gpgme.c:839
-msgid "Warning: The key used to create the signature expired at: "
+#, fuzzy
+msgid "Warning: The certificate used to create the signature expired at: "
msgstr "Varning: Nyckeln som användes för att skapa signaturen gick ut den: "
#: src/engine-gpgme.c:845
-msgid "Warning: At least one certification key has expired\n"
+#, fuzzy
+msgid "Warning: At least one certification certificate has expired\n"
msgstr "Varning: Åtminstone en certifieringsnyckel har gått ut\n"
#: src/engine-gpgme.c:851
@@ -80,7 +122,8 @@
msgstr "Varning: Signaturen gick ut den: "
#: src/engine-gpgme.c:857
-msgid "Can't verify due to a missing key or certificate\n"
+#, fuzzy
+msgid "Can't verify due to a missing certificate\n"
msgstr "Kan inte validera på grund av en saknad nyckel eller certifikat\n"
#: src/engine-gpgme.c:861
@@ -100,21 +143,25 @@
msgstr "Ett systemfel inträffade"
#: src/engine-gpgme.c:915
+#, fuzzy
msgid ""
-"WARNING: We have NO indication whether the key belongs to the person named "
-"as shown above\n"
+"WARNING: We have NO indication whether this certificate belongs to the "
+"person named as shown above\n"
msgstr ""
"VARNING: Vi har INGA indikationer på huruvida nyckeln tillhör personen vars "
"namn visas ovanför\n"
#: src/engine-gpgme.c:922
-msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+#, fuzzy
+msgid ""
+"WARNING: The certificate does NOT BELONG to the person named as shown above\n"
msgstr "VARNING: Nyckeln TILLHÖR INTE personen vars namn visas ovanför\n"
#: src/engine-gpgme.c:926
+#, fuzzy
msgid ""
-"WARNING: It is NOT certain that the key belongs to the person named as shown "
-"above\n"
+"WARNING: It is NOT certain that the certificate belongs to the person named "
+"as shown above\n"
msgstr ""
"VARNING: Det är INTE säkert att nyckeln tillhör den person vars namn visas "
"ovanför\n"
@@ -159,6 +206,172 @@
msgid "*** End Notation ***\n"
msgstr "*** Notation slut ***\n"
+#: src/ext-commands.cpp:325
+msgid "&Decrypt and verify message"
+msgstr "&Dekryptera och validera meddelandet"
+
+#: src/ext-commands.cpp:326
+#, fuzzy
+msgid "&Verify signature"
+msgstr "FELAKTIG signatur!"
+
+#: src/ext-commands.cpp:327
+msgid "&Display crypto information"
+msgstr ""
+
+#: src/ext-commands.cpp:353
+msgid "use S/MIME protocol"
+msgstr ""
+
+#: src/ext-commands.cpp:354
+#, fuzzy
+msgid "&encrypt message with GnuPG"
+msgstr "Signera meddelandet med GPG"
+
+#: src/ext-commands.cpp:355
+#, fuzzy
+msgid "&sign message with GnuPG"
+msgstr "Signera meddelandet med GPG"
+
+#: src/ext-commands.cpp:397
+#, fuzzy
+msgid "GnuPG Certificate &Manager"
+msgstr "GPG-nyckel&hanterare"
+
+#: src/ext-commands.cpp:548
+#, fuzzy
+msgid "Could not start certificate manager"
+msgstr "Kunde inte starta nyckelhanteraren"
+
+#: src/ext-commands.cpp:595
+#, 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:602
+#, 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:610 src/ext-commands.cpp:686
+msgid "Check the signature now and display the result"
+msgstr ""
+
+#: src/ext-commands.cpp:617
+#, 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:624
+msgid "Select this option to encrypt the message."
+msgstr "Välj det här alternativet för att kryptera meddelandet."
+
+#: src/ext-commands.cpp:631
+msgid "Select this option to sign the message."
+msgstr "Välj det här alternativet för att signera meddelandet."
+
+#: src/ext-commands.cpp:638
+#, 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:667 src/ext-commands.cpp:761
+msgid "Decrypt message and verify signature"
+msgstr "Dekryptera meddelandet och validera signaturen"
+
+#: src/ext-commands.cpp:676
+msgid "Show S/MIME status info"
+msgstr ""
+
+#: src/ext-commands.cpp:696
+msgid "Use S/MIME for sign/encrypt"
+msgstr ""
+
+#: src/ext-commands.cpp:706 src/ext-commands.cpp:775
+#, fuzzy
+msgid "Encrypt message with GPG"
+msgstr "Signera meddelandet med GPG"
+
+#: src/ext-commands.cpp:716 src/ext-commands.cpp:789
+msgid "Sign message with GPG"
+msgstr "Signera meddelandet med GPG"
+
+#: src/ext-commands.cpp:726
+msgid "Open the GpgOL certificate manager"
+msgstr ""
+
+#: src/ext-commands.cpp:803
+msgid "Use the S/MIME protocol"
+msgstr ""
+
+#: src/ext-commands.cpp:815
+msgid "Open the certificate manager"
+msgstr ""
+
+#: src/mapihelp.cpp:1183
+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
+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
+msgid ""
+"Sorry, we can only encrypt plain text messages and\n"
+"no RTF messages. Please make sure that only the text\n"
+"format has been selected."
+msgstr ""
+"Tyvärr, vi kan endast kryptera vanliga textmeddelanden\n"
+"och inte RTF-meddelanden. Se till att endast textformatet\n"
+"har valts i inställningarna."
+
+#: src/message.cpp:130
+msgid "[Crypto operation failed - can't show the body of the message]"
+msgstr ""
+
+#: src/message.cpp:159
+#, c-format
+msgid ""
+"Message class: %s\n"
+"Sig Status : %s\n"
+"Structure of the message:\n"
+"%s"
+msgstr ""
+
+#: src/message.cpp:167
+msgid "GpgOL - Message Information"
+msgstr ""
+
+#: src/message.cpp:750
+msgid "No recipients to encrypt to are given"
+msgstr ""
+
+#: src/message.cpp:766
+#, fuzzy, c-format
+msgid "Encryption failed (%s)"
+msgstr "Kryptering misslyckades"
+
+#: src/message.cpp:787
+#, fuzzy, c-format
+msgid "Signing failed (%s)"
+msgstr "Signering misslyckades"
+
+#: src/mimeparser.c:929
+#, fuzzy
+msgid "Error writing to stream"
+msgstr "Fel vid skrivning av fil"
+
+#: src/mimeparser.c:930
+msgid "I/O-Error"
+msgstr "In-/Ut-fel"
+
#: src/olflange-dlgs.cpp:45
#, fuzzy
msgid "&Encrypt new messages by default"
@@ -178,7 +391,7 @@
#: src/olflange-dlgs.cpp:50
#, fuzzy
-msgid "Also encrypt message with the &default key"
+msgid "Also encrypt message with the default certificate"
msgstr "Kryptera meddelandet med GPG"
#: src/olflange-dlgs.cpp:51
@@ -206,7 +419,8 @@
msgstr ""
#: src/olflange-dlgs.cpp:222
-msgid "The default key may not contain any spaces."
+#, fuzzy
+msgid "The default certificate may not contain any spaces."
msgstr "Standardnyckeln får inte innehålla några blanksteg."
#: src/olflange-dlgs.cpp:244
@@ -229,7 +443,7 @@
msgid "This is GpgOL version %s"
msgstr ""
-#: src/olflange.cpp:484
+#: src/olflange.cpp:483
msgid ""
"This version of Outlook is too old!\n"
"\n"
@@ -245,43 +459,70 @@
"\n"
"Uppdatera åtminstone till SP2 innan du försöker skicka ett meddelande"
-#: src/passphrase-dialog.c:83
-msgid "No key hint given."
+#: src/passphrase-dialog.c:85
+#, fuzzy
+msgid "No certificate hint given."
msgstr "Inget nyckeltips angivet."
-#: src/passphrase-dialog.c:328 src/passphrase-dialog.c:456
+#: src/passphrase-dialog.c:313 src/passphrase-dialog.c:464
+msgid "Enter passphrase to unlock the secret key"
+msgstr ""
+
+#: src/passphrase-dialog.c:314 src/passphrase-dialog.c:465
+msgid "Hide typing"
+msgstr ""
+
+#: src/passphrase-dialog.c:315 src/passphrase-dialog.c:466
+#: src/recipient-dialog.c:385
+msgid "&Cancel"
+msgstr ""
+
+#: src/passphrase-dialog.c:350 src/passphrase-dialog.c:499
msgid "Invalid passphrase; please try again..."
msgstr "Ogiltig lösenfras; försök igen..."
-#: src/passphrase-dialog.c:355
+#: src/passphrase-dialog.c:379
msgid "Select Signing Key"
msgstr "Välj signeringsnyckel"
-#: src/recipient-dialog.c:87
+#: src/passphrase-dialog.c:463
+msgid "Encrypted to the following certificates:"
+msgstr ""
+
+#: src/recipient-dialog.c:88
msgid "Name"
msgstr "Namn"
-#: src/recipient-dialog.c:92
+#: src/recipient-dialog.c:93
msgid "E-Mail"
msgstr "E-post"
-#: src/recipient-dialog.c:97
+#: src/recipient-dialog.c:98
msgid "Key-Info"
msgstr "Nyckelinfo"
-#: src/recipient-dialog.c:102
+#: src/recipient-dialog.c:103
msgid "Key ID"
msgstr "Nyckel-id"
-#: src/recipient-dialog.c:107
+#: src/recipient-dialog.c:108
msgid "Validity"
msgstr "Giltighet"
-#: src/recipient-dialog.c:423
-msgid "Please select at least one recipient key."
+#: src/recipient-dialog.c:383
+msgid "Selected recipients:"
+msgstr ""
+
+#: src/recipient-dialog.c:384
+msgid "Recipient which were NOT found"
+msgstr ""
+
+#: src/recipient-dialog.c:444
+#, fuzzy
+msgid "Please select at least one recipient certificate."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/recipient-dialog.c:424
+#: src/recipient-dialog.c:445
msgid "Recipient Dialog"
msgstr "Mottagardialog"
@@ -294,11 +535,13 @@
msgstr "Korrekt signatur"
#: src/verify-dialog.c:128
-msgid "Good signature from revoked key"
+#, fuzzy
+msgid "Good signature from revoked certificate"
msgstr "Korrekt signatur från spärrad nyckel"
#: src/verify-dialog.c:130
-msgid "Good signature from expired key"
+#, fuzzy
+msgid "Good signature from expired certificate"
msgstr "Korrekt signatur från utgången nyckel"
#: src/verify-dialog.c:132
@@ -306,7 +549,8 @@
msgstr "Korrekt utgången signatur"
#: src/verify-dialog.c:135
-msgid "Could not check signature: missing key"
+#, fuzzy
+msgid "Could not check signature: missing certificate"
msgstr "Kunde inte kontrollera signaturen: saknar nyckel"
#: src/verify-dialog.c:139
@@ -327,19 +571,41 @@
msgstr "Signaturen gick ut den %s"
#: src/verify-dialog.c:186
-msgid "Signature issued by a key we do NOT trust."
+#, fuzzy
+msgid "Signature issued by a certificate we do NOT trust."
msgstr "Signaturen utfärdad av en nyckel som vi INTE litar på."
#: src/verify-dialog.c:193
-msgid "Signature issued by a non-valid key."
+#, fuzzy
+msgid "Signature issued by a non-valid certificate."
msgstr "Signaturen utfärdad av en icke-giltig nyckel."
-#: src/verify-dialog.c:220
+#: src/verify-dialog.c:209
+msgid "Signature made"
+msgstr ""
+
+#: src/verify-dialog.c:210
+msgid "using"
+msgstr ""
+
+#: src/verify-dialog.c:211
+msgid "cert-ID"
+msgstr ""
+
+#: src/verify-dialog.c:212
+msgid "from"
+msgstr ""
+
+#: src/verify-dialog.c:213
+msgid "also known as"
+msgstr ""
+
+#: src/verify-dialog.c:244
#, fuzzy
msgid "OpenPGP Verification Result"
msgstr "Resultat från validering"
-#: src/verify-dialog.c:223
+#: src/verify-dialog.c:247
#, fuzzy
msgid "S/MIME Verification Result"
msgstr "Resultat från validering"
@@ -429,12 +695,6 @@
#~ msgid "Attachment Decryption"
#~ msgstr "Dekryptering av bilaga"
-#~ msgid "Signing Failure"
-#~ msgstr "Signering misslyckades"
-
-#~ msgid "Encryption Failure"
-#~ msgstr "Kryptering misslyckades"
-
#~ msgid "Attachment Encryption Failure"
#~ msgstr "Kryptering av bilaga misslyckades"
@@ -447,19 +707,6 @@
#~ msgid "Attachment Signing Failure"
#~ msgstr "Signering av bilaga misslyckades"
-#~ msgid ""
-#~ "Error creating file\n"
-#~ "Please select another one"
-#~ msgstr ""
-#~ "Fel vid skapande av fil\n"
-#~ "Välj en annan"
-
-#~ msgid "I/O-Error"
-#~ msgstr "In-/Ut-fel"
-
-#~ msgid "Error writing file"
-#~ msgstr "Fel vid skrivning av fil"
-
#~ msgid "[PGP/MIME message]"
#~ msgstr "[PGP/MIME-meddelande]"
@@ -472,45 +719,14 @@
#~ msgid "[PGP/MIME signature]"
#~ msgstr "[PGP/MIME-signatur]"
-# A bit unclear in the original text
-#~ msgid ""
-#~ "Sorry, we can only encrypt plain text messages and\n"
-#~ "no RTF messages. Please make sure that only the text\n"
-#~ "format has been selected."
-#~ msgstr ""
-#~ "Tyvärr, vi kan endast kryptera vanliga textmeddelanden\n"
-#~ "och inte RTF-meddelanden. Se till att endast textformatet\n"
-#~ "har valts i inställningarna."
-
-#~ msgid "&Decrypt and verify message"
-#~ msgstr "&Dekryptera och validera meddelandet"
-
#~ msgid "GPG &encrypt message"
#~ msgstr "GPG-&kryptera meddelandet"
#~ msgid "GPG &sign message"
#~ msgstr "GPG-&signera meddelandet"
-#~ msgid "GPG Key &Manager"
-#~ msgstr "GPG-nyckel&hanterare"
-
-#~ msgid "Could not start Key-Manager"
-#~ msgstr "Kunde inte starta nyckelhanteraren"
-
#~ msgid "Decrypt and verify the message."
#~ msgstr "Dekryptera och validera meddelandet."
-#~ msgid "Select this option to encrypt the message."
-#~ msgstr "Välj det här alternativet för att kryptera meddelandet."
-
-#~ msgid "Select this option to sign the message."
-#~ msgstr "Välj det här alternativet för att signera meddelandet."
-
#~ msgid "Open GPG Key Manager"
#~ msgstr "Öppna GPG-nyckelhanteraren"
-
-#~ msgid "Decrypt message and verify signature"
-#~ msgstr "Dekryptera meddelandet och validera signaturen"
-
-#~ msgid "Sign message with GPG"
-#~ msgstr "Signera meddelandet med GPG"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/ChangeLog 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,5 +1,10 @@
2007-10-12 Werner Koch <wk at g10code.com>
+ * gpgol-rsrcs.rc: Remove.
+ * dialogs.rc: Renamed from olflange-rsrcs.rc.
+ * dialogs.h: Rename for olflange-ids.h. Changed all includers.
+ * Makefile.am: Adjust accordingly.
+
* verify-dialog.c (verify_dialog_box): Do not distinguish
languages.
(verify_dlg_set_labels): New.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/Makefile.am 2007-10-12 19:22:35 UTC (rev 193)
@@ -12,9 +12,9 @@
## Process this file with automake to produce Makefile.in
bin_PROGRAMS = gpgol
-EXTRA_DIST = versioninfo.rc.in gpgol-rsrcs.rc olflange-rsrcs.rc \
- logo.bmp decrypt.bmp encrypt.bmp sign.bmp key_mana.bmp \
- mapi32.def
+EXTRA_DIST = versioninfo.rc.in mapi32.def \
+ logo.bmp decrypt.bmp encrypt.bmp sign.bmp key_mana.bmp
+
EXEEXT = .dll
AM_CFLAGS = $(GPGME_CFLAGS) $(LIBASSUAN_CFLAGS) -shared
@@ -27,7 +27,7 @@
olflange.cpp olflange.h \
olflange-def.h \
olflange-dlgs.cpp \
- olflange-ids.h \
+ dialogs.rc dialogs.h \
myexchext.h \
display.cpp display.h \
message.cpp message.h \
@@ -88,7 +88,7 @@
-lmapi32 -lshell32 -lgdi32 -lcomdlg32 \
-lole32 -loleaut32 -lws2_32 -ladvapi32
-resource.o: resource.rc versioninfo.rc gpgol-rsrcs.rc olflange-rsrcs.rc
+resource.o: resource.rc versioninfo.rc dialogs.rc
.rc.o:
$(WINDRES) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
Modified: trunk/src/common.c
===================================================================
--- trunk/src/common.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/common.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -142,7 +142,7 @@
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0;
ofn.Flags |= OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
- ofn.lpstrTitle = _("GPG - Save decrypted attachment");
+ ofn.lpstrTitle = _("GpgOL - Save decrypted attachment");
ofn.lpstrFilter = filter;
if (GetSaveFileName (&ofn))
Modified: trunk/src/config-dialog.c
===================================================================
--- trunk/src/config-dialog.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/config-dialog.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -29,7 +29,7 @@
#include "common.h"
#include "gpgol-ids.h"
-#include "olflange-ids.h"
+#include "dialogs.h"
/* Registry path to GnuPG */
#define REGPATH "Software\\GNU\\GnuPG"
Copied: trunk/src/dialogs.h (from rev 192, trunk/src/olflange-ids.h)
===================================================================
--- trunk/src/olflange-ids.h 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/dialogs.h 2007-10-12 19:22:35 UTC (rev 193)
@@ -0,0 +1,93 @@
+/* dialogs.h
+
+ Resouces IDs for the dialogs.
+ */
+
+#ifndef DIALOGS_H
+#define DIALOGS_H
+
+
+/* Ids used for bitmaps. */
+#define IDB_DECRYPT 3001
+#define IDB_ENCRYPT 3002
+#define IDB_SIGN 3003
+#define IDB_ADD_KEYS 3004
+#define IDB_KEY_MANAGER 3005
+#define IDB_BANNER 3006
+#define IDB_BANNER_HI 3007
+#define IDB_SELECT_SMIME 3008
+
+
+/* Ids used for the main config dialog. */
+#define IDD_GPG_OPTIONS 4001
+#define IDC_TIME_PHRASES 4010
+#define IDC_ENCRYPT_DEFAULT 4011
+#define IDC_SIGN_DEFAULT 4012
+#define IDC_ENCRYPT_WITH_STANDARD_KEY 4013
+#define IDC_SMIME_DEFAULT 4014
+#define IDC_GPG_OPTIONS 4015
+#define IDC_BITMAP 4016
+#define IDC_VERSION_INFO 4017
+#define IDC_ENCRYPT_TO 4018
+#define IDC_ENABLE_SMIME 4019
+#define IDC_PREVIEW_DECRYPT 4020
+#define IDC_PREFER_HTML 4021
+#define IDC_G_OPTIONS 4022
+#define IDC_G_PASSPHRASE 4023
+#define IDC_T_PASSPHRASE_TTL 4024
+#define IDC_T_PASSPHRASE_MIN 4025
+
+
+/* Ids for the extended options dialog. */
+#define IDD_EXT_OPTIONS 4101
+#define IDC_T_OPT_KEYMAN_PATH 4110
+#define IDC_OPT_KEYMAN_PATH 4111
+#define IDC_OPT_SEL_KEYMAN_PATH 4112
+#define IDC_T_DEBUG_LOGFILE 4113
+#define IDC_DEBUG_LOGFILE 4114
+
+
+/* Ids for the recipient selection dialog. */
+#define IDD_ENC 4201
+#define IDC_ENC_RSET1 4210
+#define IDC_ENC_RSET2_T 4211
+#define IDC_ENC_RSET2 4212
+#define IDC_ENC_NOTFOUND_T 4213
+#define IDC_ENC_NOTFOUND 4214
+
+
+/* Ids for the two decryption dialogs. */
+#define IDD_DEC 4301
+#define IDD_DECEXT 4302
+#define IDC_DEC_KEYLIST 4310
+#define IDC_DEC_HINT 4311
+#define IDC_DEC_PASSINF 4312
+#define IDC_DEC_PASS 4313
+#define IDC_DEC_HIDE 4314
+#define IDC_DECEXT_RSET_T 4320
+#define IDC_DECEXT_RSET 4321
+#define IDC_DECEXT_KEYLIST 4322
+#define IDC_DECEXT_HINT 4323
+#define IDC_DECEXT_PASSINF 4324
+#define IDC_DECEXT_PASS 4325
+#define IDC_DECEXT_HIDE 4326
+
+
+/* Ids for the verification dialog. */
+#define IDD_VRY 4401
+#define IDC_VRY_TIME_T 4410
+#define IDC_VRY_TIME 4411
+#define IDC_VRY_PKALGO_T 4412
+#define IDC_VRY_PKALGO 4413
+#define IDC_VRY_KEYID_T 4414
+#define IDC_VRY_KEYID 4415
+#define IDC_VRY_STATUS 4416
+#define IDC_VRY_ISSUER_T 4417
+#define IDC_VRY_ISSUER 4418
+#define IDC_VRY_AKALIST_T 4419
+#define IDC_VRY_AKALIST 4420
+#define IDC_VRY_HINT 4421
+
+
+
+#endif /*DIALOGS_H*/
Copied: trunk/src/dialogs.rc (from rev 192, trunk/src/olflange-rsrcs.rc)
===================================================================
--- trunk/src/olflange-rsrcs.rc 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/dialogs.rc 2007-10-12 19:22:35 UTC (rev 193)
@@ -0,0 +1,284 @@
+/* dialogs.rc - GpgOL dialog resources. -*- c -*-
+ * Copyright (C) 2004, 2005, 2006, 2007 g10 Code GmbH
+ *
+ * This file is part of GpgOL.
+ *
+ * GpgOL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * GpgOL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "dialogs.h"
+
+#include "afxres.h"
+
+
+IDB_DECRYPT BITMAP DISCARDABLE "decrypt.bmp"
+IDB_ENCRYPT BITMAP DISCARDABLE "encrypt.bmp"
+IDB_SIGN BITMAP DISCARDABLE "sign.bmp"
+IDB_KEY_MANAGER BITMAP DISCARDABLE "key_mana.bmp"
+IDB_BANNER BITMAP DISCARDABLE "logo.bmp"
+
+
+IDD_GPG_OPTIONS DIALOG DISCARDABLE 0, 0, 266, 274
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "GpgOL"
+FONT 8, "MS Sans Serif"
+BEGIN
+ /* Options box. */
+ GROUPBOX "options", IDC_G_OPTIONS,
+ 9, 9, 242, 112
+
+ CONTROL "encrypt-by-default", IDC_ENCRYPT_DEFAULT,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 19, 215, 10
+
+ CONTROL "sign-by-default", IDC_SIGN_DEFAULT,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 30, 215, 10
+
+ CONTROL "smime-by-default", IDC_SMIME_DEFAULT,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 42, 215, 10
+
+ CONTROL "enable-smime", IDC_ENABLE_SMIME,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 54, 215, 10
+
+ CONTROL "encrypt-to", IDC_ENCRYPT_WITH_STANDARD_KEY,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 67, 215, 10
+
+ EDITTEXT IDC_ENCRYPT_TO,
+ 36, 79, 133, 12, ES_AUTOHSCROLL
+
+ CONTROL "preview-decrypt", IDC_PREVIEW_DECRYPT,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 95, 215, 10
+
+ CONTROL "prefer-html", IDC_PREFER_HTML,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24, 107, 215, 10
+
+ /* Passphrase option box. */
+ GROUPBOX "Passphrase", IDC_G_PASSPHRASE,
+ 9, 124, 242, 31
+
+ LTEXT "passphrase-ttl", IDC_T_PASSPHRASE_TTL,
+ 24, 136, 80, 8
+
+ EDITTEXT IDC_TIME_PHRASES,
+ 107, 135, 39, 14, ES_AUTOHSCROLL
+
+ LTEXT "minutes", IDC_T_PASSPHRASE_MIN,
+ 151, 137, 50, 8
+
+ /* Stuff below the group boxes. */
+ PUSHBUTTON "advanced", IDC_GPG_OPTIONS,
+ 202, 166, 50, 14
+
+ LTEXT "GpgOL by g10 Code GmbH", IDC_STATIC,
+ 8, 185, 100, 8
+ LTEXT "Version x ", IDC_VERSION_INFO,
+ 150, 185, 109, 9
+
+ CONTROL IDB_BANNER, IDC_BITMAP,
+ "Static", SS_BITMAP | SS_REALSIZEIMAGE,
+ 8, 200, 150, 64
+END
+
+
+
+IDD_EXT_OPTIONS DIALOG DISCARDABLE 0, 0, 167, 119
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "GpgOL - Extended Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "keyman", IDC_T_OPT_KEYMAN_PATH,
+ 2,20, 122,8
+
+ EDITTEXT IDC_OPT_KEYMAN_PATH,
+ 2, 34, 144, 12, ES_AUTOHSCROLL
+
+ PUSHBUTTON "...", IDC_OPT_SEL_KEYMAN_PATH,
+ 148, 34, 11, 14
+
+ LTEXT "debug-logfile", IDC_T_DEBUG_LOGFILE,
+ 2, 50, 122,8
+
+ EDITTEXT IDC_DEBUG_LOGFILE,
+ 2, 60, 144, 12, ES_AUTOHSCROLL
+
+ DEFPUSHBUTTON "&OK", IDOK,
+ 112, 101, 50, 14
+END
+
+
+/*
+ The dialog to select recipient keys
+ */
+IDD_ENC DIALOG DISCARDABLE 0, 0, 332, 215
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GpgOL - Select Recipients"
+FONT 8, "MS Sans Serif"
+BEGIN
+ CONTROL "List1", IDC_ENC_RSET1,
+ "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ WS_BORDER | WS_TABSTOP,
+ 8, 4, 314, 92
+
+ LTEXT "Ausgewählte Empfänger:", IDC_ENC_RSET2_T,
+ 8, 98, 130, 8
+
+ CONTROL "List2", IDC_ENC_RSET2,
+ "SysListView32", LVS_REPORT | LVS_NOSORTHEADER |
+ WS_BORDER | WS_TABSTOP,
+ 8, 110, 313, 49
+
+ LTEXT "Recipient which were NOT found", IDC_ENC_NOTFOUND_T,
+ 8, 161, 128, 8
+
+ LISTBOX IDC_ENC_NOTFOUND,
+ 8, 170, 313, 22, LBS_SORT | LBS_NOINTEGRALHEIGHT |
+ WS_VSCROLL | WS_TABSTOP
+
+ DEFPUSHBUTTON "&OK", IDOK,
+ 221, 196, 50, 14
+
+ PUSHBUTTON "&Cancel-btn", IDCANCEL,
+ 273, 196, 50, 14
+END
+
+
+/*
+ The decryption dialog used to select the secret key.
+*/
+IDD_DEC DIALOG DISCARDABLE 0, 0, 225, 101
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Secret Key Selection"
+FONT 8, "MS Sans Serif"
+BEGIN
+ COMBOBOX IDC_DEC_KEYLIST,
+ 9, 7, 209, 58, CBS_DROPDOWNLIST | WS_VSCROLL |
+ WS_TABSTOP
+
+ LTEXT "", IDC_DEC_HINT,
+ 9, 25, 201, 10
+
+ LTEXT "enter-passphrase", IDC_DEC_PASSINF,
+ 9, 37, 158, 8
+
+ EDITTEXT IDC_DEC_PASS,
+ 9, 51, 207, 12, ES_PASSWORD | ES_AUTOHSCROLL
+
+ CONTROL "&Hide Typing", IDC_DEC_HIDE,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 138, 64, 81, 10
+
+ DEFPUSHBUTTON "&OK", IDOK,
+ 115, 83, 50, 14
+
+ PUSHBUTTON "&Cancel-btn", IDCANCEL,
+ 167, 83, 50, 14
+END
+
+
+/*
+ The extended decryption dialog used to select the secret key.
+*/
+IDD_DECEXT DIALOG DISCARDABLE 0, 0, 207, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "GpgOL - Secret Key Selection"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "encrypted-to",IDC_DECEXT_RSET_T,
+ 7, 4, 128, 8
+
+ LISTBOX IDC_DECEXT_RSET,
+ 7, 16, 193, 25, LBS_NOINTEGRALHEIGHT |
+ WS_VSCROLL | WS_TABSTOP
+
+ COMBOBOX IDC_DECEXT_KEYLIST,
+ 8, 54, 191, 14, CBS_DROPDOWN | CBS_SORT |
+ WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+
+ LTEXT "", IDC_DECEXT_HINT,
+ 7, 73, 193, 8
+
+ LTEXT "enter-passphrase", IDC_DECEXT_PASSINF,
+ 7, 85, 158, 8
+
+ EDITTEXT IDC_DECEXT_PASS,
+ 7, 96, 192, 12, ES_PASSWORD | ES_AUTOHSCROLL
+
+ CONTROL "hide-typing", IDC_DECEXT_HIDE,
+ "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+ 122, 108, 81, 10
+
+ DEFPUSHBUTTON "OK", IDOK,
+ 98, 125, 50, 14
+
+ PUSHBUTTON "&Cancel-btn", IDCANCEL,
+ 149, 125, 50, 14
+END
+
+
+/*
+ The dialog to display verification results.
+*/
+IDD_VRY DIALOG DISCARDABLE 0, 0, 253, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "GpgOL - Signature Verification Result"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "made-at", IDC_VRY_TIME_T,
+ 3, 6, 50, 8
+
+ EDITTEXT IDC_VRY_TIME,
+ 55, 4, 76, 12, ES_AUTOHSCROLL | ES_READONLY
+
+ LTEXT "using", IDC_VRY_PKALGO_T,
+ 132, 6, 18, 8
+
+ EDITTEXT IDC_VRY_PKALGO,
+ 152, 4, 20, 12, ES_AUTOHSCROLL | ES_READONLY
+
+ LTEXT "key-id", IDC_VRY_KEYID_T,
+ 174, 7, 50, 8
+
+ EDITTEXT IDC_VRY_KEYID,
+ 196, 4, 51, 12, ES_AUTOHSCROLL | ES_READONLY
+
+ EDITTEXT IDC_VRY_STATUS,
+ 3, 29, 92, 12, ES_AUTOHSCROLL | ES_READONLY
+
+ LTEXT "from", IDC_VRY_ISSUER_T,
+ 98, 31, 14, 8
+
+ EDITTEXT IDC_VRY_ISSUER,
+ 117, 29, 131, 13, ES_AUTOHSCROLL | ES_READONLY
+
+ LTEXT "aka", IDC_VRY_AKALIST_T,
+ 3, 47, 56, 8
+
+ LISTBOX IDC_VRY_AKALIST,
+ 3, 56, 245, 25, LBS_SORT | LBS_NOINTEGRALHEIGHT |
+ WS_VSCROLL | WS_TABSTOP
+
+ LTEXT "", IDC_VRY_HINT,
+ 3, 83, 245, 10
+
+ DEFPUSHBUTTON "&OK", IDOK,
+ 198, 96, 50, 14
+END
+
Modified: trunk/src/engine-gpgme.c
===================================================================
--- trunk/src/engine-gpgme.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/engine-gpgme.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -351,11 +351,11 @@
if (!defkey)
{
MessageBox (hwnd,
- _("The configured default encryption certificate is not "
- "available or does not unambigiously specify one. "
- "Please fix this in the option dialog.\n\n"
- "This message won't be be encrypted to this key!"),
- _("Encryption"), MB_ICONWARNING|MB_OK);
+ _("The configured default encryption certificate is not "
+ "available or does not unambigiously specify one. "
+ "Please fix this in the option dialog.\n\n"
+ "This message won't be be encrypted to this certificate!"),
+ _("Encryption"), MB_ICONWARNING|MB_OK);
}
else
{
Modified: trunk/src/ext-commands.cpp
===================================================================
--- trunk/src/ext-commands.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/ext-commands.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -31,7 +31,7 @@
#include "msgcache.h"
#include "mapihelp.h"
-#include "olflange-ids.h"
+#include "dialogs.h" /* For IDB_foo. */
#include "olflange-def.h"
#include "olflange.h"
#include "ol-ext-callback.h"
@@ -326,8 +326,8 @@
_("&Verify signature"), &m_nCmdCheckSig,
_("&Display crypto information"), &m_nCmdShowInfo,
"@", NULL,
- _("Debug-1 (open_inspector)"), &m_nCmdDebug1,
- _("Debug-2 (n/a)"), &m_nCmdDebug2,
+ "Debug-1 (open_inspector)", &m_nCmdDebug1,
+ "Debug-2 (n/a)", &m_nCmdDebug2,
NULL);
hwnd_toolbar = toolbar_from_tbe (pTBEArray, nTBECnt, &tb_idx);
@@ -394,7 +394,7 @@
toolbar_add_menu
(pEECB, pnCommandIDBase,
"@", NULL,
- _("GnuPG Key &Manager"), &m_nCmdKeyManager,
+ _("GnuPG Certificate &Manager"), &m_nCmdKeyManager,
NULL);
hwnd_toolbar = toolbar_from_tbe (pTBEArray, nTBECnt, &tb_idx);
@@ -545,7 +545,7 @@
&& m_lContext == EECONTEXT_VIEWER)
{
if (start_key_manager ())
- MessageBox (NULL, _("Could not start Key-Manager"),
+ MessageBox (NULL, _("Could not start certificate manager"),
"GpgOL", MB_ICONERROR|MB_OK);
}
else if (nCommandID == m_nCmdDebug1
@@ -634,7 +634,8 @@
else if (nCommandID == m_nCmdKeyManager
&& m_lContext == EECONTEXT_VIEWER)
{
- MessageBox (m_hWnd, _("Select this option to open GpgOL Key Manager"),
+ MessageBox (m_hWnd,
+ _("Select this option to open the certificate manager"),
"GpgOL", MB_OK);
}
else
@@ -722,7 +723,7 @@
lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
lstrcpyn (pszText,
- _("Open the GpgOL Key Manager"),
+ _("Open the GpgOL certificate manager"),
nCharCnt);
}
else
@@ -811,7 +812,7 @@
pTBB->fsStyle = TBSTYLE_BUTTON;
pTBB->dwData = 0;
pTBB->iString = -1;
- lstrcpyn (description, _("Open GPG Key Manager"),
+ lstrcpyn (description, _("Open the certificate manager"),
description_size);
}
else
Deleted: trunk/src/gpgol-rsrcs.rc
Modified: trunk/src/message-events.cpp
===================================================================
--- trunk/src/message-events.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/message-events.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -30,7 +30,6 @@
#include "msgcache.h"
#include "mapihelp.h"
-#include "olflange-ids.h"
#include "olflange-def.h"
#include "olflange.h"
#include "ol-ext-callback.h"
Modified: trunk/src/ol-ext-callback.cpp
===================================================================
--- trunk/src/ol-ext-callback.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/ol-ext-callback.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -31,7 +31,6 @@
#include "msgcache.h"
#include "mapihelp.h"
-#include "olflange-ids.h"
#include "olflange-def.h"
#include "olflange.h"
#include "ol-ext-callback.h"
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/olflange-dlgs.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -32,7 +32,7 @@
#include "display.h"
#include "ol-ext-callback.h"
#include "olflange-def.h"
-#include "olflange-ids.h"
+#include "dialogs.h"
/* To avoid writing a dialog template for each language we use gettext
Deleted: trunk/src/olflange-ids.h
Deleted: trunk/src/olflange-rsrcs.rc
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/olflange.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -39,7 +39,6 @@
#include "engine.h"
#include "mapihelp.h"
-#include "olflange-ids.h"
#include "olflange-def.h"
#include "olflange.h"
#include "ext-commands.h"
Modified: trunk/src/passphrase-dialog.c
===================================================================
--- trunk/src/passphrase-dialog.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/passphrase-dialog.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -29,9 +29,10 @@
#include "common.h"
#include "gpgol-ids.h"
-#include "olflange-ids.h"
#include "passcache.h"
+#include "dialogs.h"
+
#define TRACEPOINT() do { log_debug ("%s:%s:%d: tracepoint\n", \
SRCNAME, __func__, __LINE__); \
} while (0)
Modified: trunk/src/property-sheets.cpp
===================================================================
--- trunk/src/property-sheets.cpp 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/property-sheets.cpp 2007-10-12 19:22:35 UTC (rev 193)
@@ -32,9 +32,9 @@
#include "engine.h"
#include "mapihelp.h"
-#include "olflange-ids.h"
#include "olflange-def.h"
#include "olflange.h"
+#include "dialogs.h"
#include "property-sheets.h"
Modified: trunk/src/recipient-dialog.c
===================================================================
--- trunk/src/recipient-dialog.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/recipient-dialog.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -34,7 +34,7 @@
#include "common.h"
#include "gpgol-ids.h"
-#include "olflange-ids.h"
+#include "dialogs.h"
#define TRACEPOINT() do { log_debug ("%s:%s:%d: tracepoint\n", \
Modified: trunk/src/resource.rc
===================================================================
--- trunk/src/resource.rc 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/resource.rc 2007-10-12 19:22:35 UTC (rev 193)
@@ -1,8 +1,7 @@
/* Simple wrapper to create one resource file from several RC
files. */
-#include "gpgol-rsrcs.rc"
-#include "olflange-rsrcs.rc"
+#include "dialogs.rc"
#include "versioninfo.rc"
Modified: trunk/src/verify-dialog.c
===================================================================
--- trunk/src/verify-dialog.c 2007-10-12 18:11:41 UTC (rev 192)
+++ trunk/src/verify-dialog.c 2007-10-12 19:22:35 UTC (rev 193)
@@ -24,8 +24,8 @@
#include "common.h"
#include "gpgol-ids.h"
+#include "dialogs.h"
-
struct dialog_context
{
gpgme_verify_result_t res;
More information about the Gnupg-commits
mailing list