[Winpt-commits] r129 - in trunk: . Include Po Src

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Dec 30 14:56:15 CET 2005


Author: twoaday
Date: 2005-12-30 14:56:10 +0100 (Fri, 30 Dec 2005)
New Revision: 129

Removed:
   trunk/Po/winpt.pot
Modified:
   trunk/Include/ChangeLog
   trunk/Include/wptCommonCtl.h
   trunk/Include/wptGPG.h
   trunk/Include/wptKeyEdit.h
   trunk/Include/wptKeyManager.h
   trunk/Include/wptKeylist.h
   trunk/Include/wptUTF8.h
   trunk/Include/wptW32API.h
   trunk/NEWS
   trunk/Po/de.po
   trunk/README
   trunk/README-0.11.txt
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/resource.h
   trunk/Src/wptAboutDlgs.cpp
   trunk/Src/wptClipDecryptDlg.cpp
   trunk/Src/wptClipEncryptDlg.cpp
   trunk/Src/wptClipSignDlg.cpp
   trunk/Src/wptClipSignEncDlg.cpp
   trunk/Src/wptClipVerifyDlg.cpp
   trunk/Src/wptFileManager.cpp
   trunk/Src/wptFileManagerDlg.cpp
   trunk/Src/wptGPGMEData.cpp
   trunk/Src/wptGPGUtil.cpp
   trunk/Src/wptKeyEdit.cpp
   trunk/Src/wptKeyEditCB.cpp
   trunk/Src/wptKeyEditDlgs.cpp
   trunk/Src/wptKeyManager.cpp
   trunk/Src/wptKeyManagerDlg.cpp
   trunk/Src/wptKeyPropsDlg.cpp
   trunk/Src/wptKeyRevokeDlg.cpp
   trunk/Src/wptKeyRevokersDlg.cpp
   trunk/Src/wptKeylist.cpp
   trunk/Src/wptKeyserverDlg.cpp
   trunk/Src/wptKeysigDlg.cpp
   trunk/Src/wptKeysignDlg.cpp
   trunk/Src/wptListView.cpp
   trunk/Src/wptMAPI.cpp
   trunk/Src/wptMainProc.cpp
   trunk/Src/wptPassphraseCB.cpp
   trunk/Src/wptRegistry.cpp
   trunk/Src/wptVerifyList.cpp
   trunk/Src/wptW32API.cpp
   trunk/TODO-GPGME-PORT.txt
   trunk/configure.ac
Log:
2005-12-27  Timo Schulz  <ts at g10code.com>
                                                                                
        * wptListView.cpp (listview_set_view): New.
        (listview_del_column): New.
        * wptW32API.cpp (get_locale_date): New.
        (get_menu_state): New.
        (force_foreground_window): New.
        * wptVerifyList.cpp (strtimestamp): Support for
        locale date formats.
        * wptGPGUtil.cpp (gpg_revoke_cert): Handle bad
        passphrases.
        * wptKeyEditCB.cpp (editkey_command_handler): Immediately
        return when a bad passphrase was submitted.
        * wptKeyRevokersDlg.cpp (keyrevokers_dlg_proc): Change
        column order.
        * wptKeylist.cpp (keylist_upd_col): New.
        * wptKeyManagerDlg.cpp (update_ui_items): Deactivate
        'Revocation' for public keys.
        (translate_menu_strings): s/Revoke/Revoke Cert.
        (modify_listview_columns): New.



Modified: trunk/Include/ChangeLog
===================================================================
--- trunk/Include/ChangeLog	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/ChangeLog	2005-12-30 13:56:10 UTC (rev 129)
@@ -1,3 +1,9 @@
+2005-12-27  Timo Schulz  <ts at g10code.com>
+
+	* wptCommonCtl.h (listview_del_column): New.
+	* wptW32API.h (get_locale_date): New.
+	* wptKeylist.h (keylist_udp_col): New.
+	
 2005-12-11  Timo Schulz  <ts at g10code.com>
 
 	* wptGPG.h: New prototypes.

Modified: trunk/Include/wptCommonCtl.h
===================================================================
--- trunk/Include/wptCommonCtl.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptCommonCtl.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -86,6 +86,7 @@
 void listview_select_one (listview_ctrl_t ctx, int pos);
 int listview_find (listview_ctrl_t ctx, const char * str);
 void listview_scroll (listview_ctrl_t ctx, int oldpos, int newpos);
+int listview_del_column (listview_ctrl_t ctx, int pos);
 
 /*-- Image List --*/
 extern HIMAGELIST glob_imagelist;

Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptGPG.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -237,10 +237,10 @@
 gpgme_error_t gpg_export_seckey (const char *keyid, const char *outfile);
 gpgme_error_t gpg_manage_ownertrust (char **data, int do_export);
 
-char*  generate_revoc_input (int code, const char *cmt, const char *pass);
-gpgme_error_t gpg_revoke_key (const char *inp_data, 
-			      const char *keyid,
-			      char **r_revcert);
+char*  generate_revoke_input (int code, const char *cmt, const char *pass);
+gpgme_error_t gpg_revoke_cert (const char *inp_data, 
+			       const char *keyid,
+			       char **r_revcert);
 gpgme_error_t gpg_decode_c_string (const char *src, char **destp, size_t len);
 gpgme_error_t gpg_import_key_list (const char *fname, char **r_out);
 gpgme_error_t get_uat_validity (const char *keyid, gpgme_validity_t *r_valid);

Modified: trunk/Include/wptKeyEdit.h
===================================================================
--- trunk/Include/wptKeyEdit.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptKeyEdit.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -57,13 +57,6 @@
     GPG_REVOKE_NOUSED     = 3
 };
 
-
-/* Possible results for the operation. */
-enum gpg_edit_result_t {
-    GPG_EDITRES_ALREADY_SIGNED = 1,
-    GPG_EDITRES_BAD_PASSPHRASE = 2
-};
-
 /* Contain information about designated revokers. */
 struct gpg_desig_rev_s {
     struct gpg_desig_rev_s *next;
@@ -99,7 +92,6 @@
     int type;
 
 public:
-    
     int cnt;
     int cmd_sent;
     const char *pass;

Modified: trunk/Include/wptKeyManager.h
===================================================================
--- trunk/Include/wptKeyManager.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptKeyManager.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -49,12 +49,10 @@
     int		    use_name;
 };
 
-/*-- wptFileManager.cpp --*/
-int overwrite_file (const char *fname);
-
 /*-- wptClipImportDlg.cpp --*/
 void print_import_status (gpgme_import_result_t res);
 
+/*-- wptKeyManager.cpp --*/
 int km_check_for_seckey (listview_ctrl_t lv, int pos, int * utrust);
 int km_check_key_status( listview_ctrl_t lv, int pos );
 int km_get_key_status( listview_ctrl_t lv, int pos );
@@ -69,13 +67,12 @@
 int km_send_to_keyserver( listview_ctrl_t lv, HWND dlg, const char * host, unsigned short port);
 int km_send_to_mail_recipient( listview_ctrl_t lv, HWND dlg );
 void km_refresh_from_keyserver(listview_ctrl_t lv, HWND dlg);
-void km_update_default_key_str( HWND dlg);
-void km_update_status_bar( HWND sb, listview_ctrl_t lv);
 int km_check_if_protected( listview_ctrl_t lv, int pos );
 int km_enable_disable_key( listview_ctrl_t lv, HWND dlg, int pos, int enable );
 void km_set_clip_info( const char *uid );
 int km_key_is_v3( listview_ctrl_t lv, int pos );
 void km_find_key (HWND dlg, listview_ctrl_t lv);
+char* km_gen_export_filename (const char *keyid, int is_secret);
 
 #if 0
 gpg_optfile_t km_groupdb_open( void );

Modified: trunk/Include/wptKeylist.h
===================================================================
--- trunk/Include/wptKeylist.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptKeylist.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -53,17 +53,16 @@
 
 /* Symbolic column IDs. */
 enum km_col_t {
-    KM_COL_UID      = 0,
+    KM_COL_UID	    = 0,
     KM_COL_KEYID    = 1,
-    KM_COL_TYPE     = 2,
-    KM_COL_SIZE     = 3,
+    KM_COL_TYPE	    = 2,
+    KM_COL_SIZE	    = 3,
     KM_COL_CIPHER   = 4,
     KM_COL_VALID    = 5,
     KM_COL_TRUST    = 6,
     KM_COL_CREAT    = 7
 };
 
-
 /* Signature verification context for a file. */
 struct file_sig_ctx_s {
     char		*file;      /* plaintext file name */
@@ -74,8 +73,8 @@
 typedef struct file_sig_ctx_s *file_sig_ctx_t;
 
 /*-- keylist.c --*/
+const char*  get_key_pubalgo2 (gpgme_pubkey_algo_t alg);
 const char*  get_key_pubalgo (gpgme_pubkey_algo_t alg);
-const char*  get_key_pubalgo2 (gpgme_pubkey_algo_t alg);
 const char * get_key_algo( gpgme_key_t key, int keyidx );
 const char * get_key_created( long timestamp );
 const char * get_key_expire_date( long timestamp );
@@ -98,6 +97,7 @@
 void keylist_delete( listview_ctrl_t lv );
 int keylist_add_key (listview_ctrl_t lv, int mode, gpgme_key_t key);
 void keylist_upd_key (listview_ctrl_t lv, int pos, gpgme_key_t key);
+void keylist_upd_col (listview_ctrl_t lv, int col);
 gpgme_key_t* keylist_get_recipients( listview_ctrl_t lv, 
 				        int *r_force_trust, int *r_count );
 gpgme_key_t* keylist_enum_recipients( listview_ctrl_t lv,  int listype, int *r_count );

Modified: trunk/Include/wptUTF8.h
===================================================================
--- trunk/Include/wptUTF8.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptUTF8.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -1,5 +1,5 @@
 /* wptUTF8.h
- *	Copyright (C) 2002, 2003, 2004 Timo Schulz
+ *	Copyright (C) 2002, 2003, 2004, 2005 Timo Schulz
  *
  * This file is part of WinPT.
  *
@@ -21,10 +21,11 @@
 #ifndef WPT_UTF8_H
 #define WPT_UTF8_H
 
-int set_native_charset (const char * newset);
-const char * get_native_charset (void);
-int is_8bit_string (const char * str);
-char * utf8_to_wincp (const char * s, size_t len);
-char * wincp_to_utf8 (const char * s, size_t len);
+int set_native_charset (const char *newset);
+const char* get_native_charset (void);
+int is_8bit_string (const char *str);
+char *wincp_to_utf8 (const char *s, size_t len); 
+char *utf8_to_wincp (const char *s, size_t len);
+#define utf8_to_wincp2(encstr) utf8_to_wincp ((encstr), strlen (encstr))
 
 #endif /*WPT_UTF8_H*/

Modified: trunk/Include/wptW32API.h
===================================================================
--- trunk/Include/wptW32API.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Include/wptW32API.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -24,10 +24,6 @@
 #include "wptCrypto.h"
 #include "wptUtil.h"
 
-struct reminder_ctx_s {
-    int msecs;
-};
-
 struct curr_wnd_ctx {
     HWND main;
     HWND focus;
@@ -53,7 +49,7 @@
 int file_exist_check (const char *fname);
 int dir_exist_check (const char *dir);
 DWORD get_file_size (const char *fname);
-int get_file_version (const char *fname, WORD *major, WORD *minor,
+int get_file_version (const char *fname, WORD *major, WORD *minor, 
 		      WORD *patch1, WORD *patch2);
 
 int get_window_contents( HWND old_hwnd, curr_wnd_ctx *ctx, int *r_hotkey );
@@ -61,13 +57,12 @@
 
 void center_window (HWND hwndChild, HWND hwndParent);
 void center_window2 (HWND hwndChild, HWND parent, HWND style);
-HANDLE window_reminder (struct reminder_ctx_s * ctx);
-void set_active_window (HWND dlg);
-void reset_active_window (void);
+void force_foreground_window (HWND dlg, int msecs);
 
-void set_menu_text (HMENU menu, int m_uid, const char *text);
-void set_menu_text_bypos (HMENU menu, int pos, const char *text);
-void set_menu_state (HMENU menu, int m_uid, int state);
+void set_menu_text (HMENU menu, UINT m_uid, const char *text);
+void set_menu_text_bypos (HMENU menu, UINT pos, const char *text);
+void set_menu_state (HMENU menu, UINT m_uid, UINT state);
+UINT get_menu_state (HMENU menu, UINT m_uid);
 
 char* get_clip_text (HWND hwnd);
 int set_clip_text (HWND hwnd, const char *text, int nbytes);
@@ -81,8 +76,9 @@
 const char* get_fileopen_dlg (HWND hwnd, const char *title,
 			      const char *filter, const char *name);
 const char * get_folder_dlg( HWND hwnd, const char * title, const char * name );
-char * m_strdup( const char *str );
+char * m_strdup (const char *str);
 const char * strtimestamp (long timestamp);
+const char* get_locale_date (long tm_t, char *buf, DWORD buflen);
 
 
 #define listbox_add_string(lb, string) \
@@ -116,9 +112,9 @@
 		   HH_TP_HELP_CONTEXTMENU, (DWORD)helparr); \
     } while (0)
 #else
-#define html_help_init(cookie) do { } while (0)
-#define html_help_deinit() do { } while (0)
-#define html_help_dispatch(param, file, helparr) do { } while (0)
+#define html_help_init(cookie) do {} while (0)
+#define html_help_deinit() do {} while (0)
+#define html_help_dispatch(param, file, helparr) do {} while (0)
 #endif
 
 #endif /* WPT_W32_API_H */

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/NEWS	2005-12-30 13:56:10 UTC (rev 129)
@@ -694,4 +694,7 @@
 * Some fixes for the GPG environment checking code.
 * Remind the size of the Key Manager columns and restore them
   on each startup.
-  
\ No newline at end of file
+* Fix for a problem for the key edit code when a wrong passphrase
+  was comitted.
+* A lot of cosmetical changes for the dialogs.
+* Add properly UTF8 handling for the dialogs.

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Po/de.po	2005-12-30 13:56:10 UTC (rev 129)
@@ -12,10 +12,10 @@
 # BUG: GetOpenFileName needs \0\0. gettext does not support it.
 msgid ""
 msgstr ""
-"Project-Id-Version: WinPT 0.11.3\n"
+"Project-Id-Version: WinPT 0.11.4\n"
 "Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2005-12-18 20:12+0100\n"
-"PO-Revision-Date: 2005-12-16 16:10+0100\n"
+"POT-Creation-Date: 2005-12-30 14:59+0100\n"
+"PO-Revision-Date: 2005-12-28 16:10+0100\n"
 "Last-Translator: Timo Schulz <ts at g10code.de>\n"
 "Language-Team: DE <twoaday at freakmail.de>\n"
 "MIME-Version: 1.0\n"
@@ -36,13 +36,13 @@
 #: Src/WinPT.cpp:512 Src/WinPT.cpp:525 Src/WinPT.cpp:574 Src/WinPT.cpp:595
 #: Src/WinPT.cpp:612 Src/wptErrors.cpp:140 Src/wptGPG.cpp:889
 #: Src/wptGPG.cpp:900 Src/wptGPG.cpp:909 Src/wptGPG.cpp:919
-#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:531
+#: Src/wptMainProc.cpp:343 Src/wptMainProc.cpp:527
 msgid "WinPT Error"
 msgstr "WinPT Fehler"
 
 #: Src/WinPT.cpp:142
 msgid "Could not create GPG home directory"
-msgstr "Konnte GPG Heimatverzeichnis nicht erstellen"
+msgstr "Konnte GPG-Heimatverzeichnis nicht erstellen"
 
 #: Src/WinPT.cpp:172
 msgid "No useable secret key found."
@@ -61,12 +61,12 @@
 "Sorry, Sie benötigen eine neuere GPG-Version.\n"
 "Aktuelle GPG-Version %d.%d.%d benötigte benoetigte GPG version "
 
-#: Src/WinPT.cpp:260 Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverDlg.cpp:55
-#: Src/wptKeyserverDlg.cpp:184 Src/wptKeyserverDlg.cpp:192
-#: Src/wptKeyserverDlg.cpp:208 Src/wptKeyserverDlg.cpp:354
-#: Src/wptKeyserverDlg.cpp:359 Src/wptKeyserverDlg.cpp:489
-#: Src/wptKeyserverDlg.cpp:496 Src/wptKeyserverDlg.cpp:502
-#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverDlg.cpp:531
+#: Src/WinPT.cpp:260 Src/wptKeyManagerDlg.cpp:924 Src/wptKeyserverDlg.cpp:56
+#: Src/wptKeyserverDlg.cpp:186 Src/wptKeyserverDlg.cpp:194
+#: Src/wptKeyserverDlg.cpp:210 Src/wptKeyserverDlg.cpp:356
+#: Src/wptKeyserverDlg.cpp:361 Src/wptKeyserverDlg.cpp:491
+#: Src/wptKeyserverDlg.cpp:498 Src/wptKeyserverDlg.cpp:504
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:533
 #: Src/wptKeyserverSearchDlg.cpp:127
 msgid "Keyserver"
 msgstr "Schlüsselserver"
@@ -130,8 +130,8 @@
 # c:\oss\winpt-gpgme\src\WinPT.cpp:376
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:426
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:711
-#: Src/WinPT.cpp:467 Src/wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:792
+#: Src/WinPT.cpp:467 Src/wptFileManagerDlg.cpp:479
+#: Src/wptFileManagerDlg.cpp:793
 msgid "Wipe Free Space"
 msgstr "Freispeicher Löschen"
 
@@ -181,25 +181,29 @@
 msgid "About GnuPG"
 msgstr "Über GnuPG"
 
-#: Src/wptAboutDlgs.cpp:93 Src/wptKeyManagerDlg.cpp:1517
-#: Src/wptMainProc.cpp:575
+#: Src/wptAboutDlgs.cpp:93 Src/wptKeyManagerDlg.cpp:1593
+#: Src/wptMainProc.cpp:569
 msgid "About WinPT"
 msgstr "Über WinPT"
 
-#: Src/wptAboutDlgs.cpp:95
+#: Src/wptAboutDlgs.cpp:94
+msgid "Warranty"
+msgstr "Gewährleistung"
+
+#: Src/wptAboutDlgs.cpp:96
 msgid "A free open source privacy tray for Windows based on GnuPG."
 msgstr "Ein freies OpenSource Privacy Tool für Windows basierend auf GnuPG."
 
-#: Src/wptAboutDlgs.cpp:97
+#: Src/wptAboutDlgs.cpp:98
 msgid "For more information you can visit the homepage: http://www.winpt.org"
 msgstr "Mehr Informationen können Sie die auf http://www.winpt.org bekommen"
 
-#: Src/wptAboutDlgs.cpp:99
+#: Src/wptAboutDlgs.cpp:100
 msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
 msgstr ""
 "Bitte melden Sie Fehler oder Anregungen zu WinPT an <winpt at freakmail.de>"
 
-#: Src/wptAboutDlgs.cpp:101
+#: Src/wptAboutDlgs.cpp:102
 msgid ""
 "WinPT is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -211,7 +215,7 @@
 "weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder "
 "(nach Ihrer Option) jeder späteren Version."
 
-#: Src/wptAboutDlgs.cpp:106
+#: Src/wptAboutDlgs.cpp:107
 msgid ""
 "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
@@ -222,17 +226,17 @@
 "Nähere Details entnehmen Sie bitte der General Public License."
 
 # c:\oss\winpt-gpgme\src\wptAboutDlgs.cpp:97
-#: Src/wptAboutDlgs.cpp:110
+#: Src/wptAboutDlgs.cpp:111
 msgid "&About GPG..."
 msgstr "Über &GPG"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
-#: Src/wptAboutDlgs.cpp:111 Src/wptKeyEditDlgs.cpp:1802
-#: Src/wptKeyManagerDlg.cpp:866
+#: Src/wptAboutDlgs.cpp:112 Src/wptKeyEditDlgs.cpp:1805
+#: Src/wptKeyManagerDlg.cpp:930
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: Src/wptCardDlg.cpp:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:401
+#: Src/wptCardDlg.cpp:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:399
 msgid "Card Manager"
 msgstr "Kartenmanager"
 
@@ -256,7 +260,7 @@
 #: Src/wptCardDlg.cpp:714 Src/wptCardDlg.cpp:717 Src/wptCardDlg.cpp:742
 #: Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749 Src/wptCardDlg.cpp:754
 #: Src/wptCardDlg.cpp:816 Src/wptCardDlg.cpp:831 Src/wptCardDlg.cpp:834
-#: Src/wptMainProc.cpp:297
+#: Src/wptMainProc.cpp:296
 msgid "Card Edit"
 msgstr "Karten-Editor"
 
@@ -313,7 +317,7 @@
 "Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:459
+#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:460
 msgid "&Name"
 msgstr "&Name"
 
@@ -329,7 +333,7 @@
 msgid "Off-card passphrase"
 msgstr "\"Off-card\" Passwort"
 
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:596 Src/wptKeygenDlg.cpp:392
+#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:598 Src/wptKeygenDlg.cpp:392
 msgid "&Never"
 msgstr "&Niemals"
 
@@ -337,7 +341,7 @@
 msgid "Email &address"
 msgstr "Mail-&Adresse"
 
-#: Src/wptCardDlg.cpp:606 Src/wptKeyManagerDlg.cpp:1411
+#: Src/wptCardDlg.cpp:606 Src/wptKeyManagerDlg.cpp:1483
 msgid "Card Key Generation"
 msgstr "Karten-Schlüsselerzeugung"
 
@@ -366,7 +370,7 @@
 msgid "Please use plain ASCII charset for the fields."
 msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
 
-#: Src/wptCardDlg.cpp:681 Src/wptKeyEditDlgs.cpp:1296
+#: Src/wptCardDlg.cpp:681 Src/wptKeyEditDlgs.cpp:1299
 msgid "The date you have chosen lies in the past."
 msgstr "Das gewählte Datum ist in der Vergangenheit."
 
@@ -429,20 +433,20 @@
 "Bitte die OpenPGP SmartCard einlegen\n"
 "OK zum Fortfahren oder Abbrechen"
 
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:58
-#: Src/wptClipDecryptDlg.cpp:199 Src/wptFileManager.cpp:1230
-#: Src/wptKeyRevokersDlg.cpp:98 Src/wptKeyRevokersDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:54 Src/wptClipDecryptDlg.cpp:57
+#: Src/wptClipDecryptDlg.cpp:200 Src/wptFileManager.cpp:1232
+#: Src/wptKeyRevokersDlg.cpp:107 Src/wptKeyRevokersDlg.cpp:157
 msgid "user ID not found"
 msgstr "Benutzerkennung nicht gefunden"
 
 #: Src/wptClipDecryptDlg.cpp:118 Src/wptClipDecryptDlg.cpp:130
-#: Src/wptClipDecryptDlg.cpp:138 Src/wptClipDecryptDlg.cpp:148
-#: Src/wptClipDecryptDlg.cpp:150 Src/wptFileManager.cpp:1268
-#: Src/wptFileManager.cpp:1319
+#: Src/wptClipDecryptDlg.cpp:138 Src/wptClipDecryptDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:148 Src/wptFileManager.cpp:1270
+#: Src/wptFileManager.cpp:1321
 msgid "Decryption"
 msgstr "Entschlüsselung"
 
-#: Src/wptClipDecryptDlg.cpp:131 Src/wptFileManager.cpp:1320
+#: Src/wptClipDecryptDlg.cpp:131 Src/wptFileManager.cpp:1322
 #, c-format
 msgid ""
 "Encrypted with %s key, ID %s.%s\n"
@@ -457,67 +461,67 @@
 msgstr ""
 
 # c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:146
+#: Src/wptClipDecryptDlg.cpp:145
 msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
 msgstr ""
 "Ungültige OpenPGP Nachricht  (vielleicht: \"quoted printable\" im Armorteil)."
 
-#: Src/wptClipDecryptDlg.cpp:166 Src/wptClipEncryptDlg.cpp:208
-#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:231
-#: Src/wptClipSignEncDlg.cpp:199 Src/wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:691 Src/wptKeyManager.cpp:921 Src/wptSymEnc.cpp:90
+#: Src/wptClipDecryptDlg.cpp:164 Src/wptClipEncryptDlg.cpp:206
+#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:229
+#: Src/wptClipSignEncDlg.cpp:197 Src/wptKeyManager.cpp:323
+#: Src/wptKeyManager.cpp:698 Src/wptKeyManager.cpp:889 Src/wptSymEnc.cpp:90
 msgid "GnuPG Status: Finished"
 msgstr "GnuPG-Status: Abgeschlossen"
 
-#: Src/wptClipDecryptDlg.cpp:183
+#: Src/wptClipDecryptDlg.cpp:184
 msgid "Signature Status: Created with a fully trusted key"
 msgstr "Signatur Status: Erstellt mit einem vertraunswürdigem Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:185
+#: Src/wptClipDecryptDlg.cpp:186
 msgid "Signature Status: Created with a marginal trusted key"
 msgstr ""
 "Signatur Status: Erstellt mit einem teilweise vertrauenswürdigem Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:188
+#: Src/wptClipDecryptDlg.cpp:189
 msgid "Signature Status: Created with an UNTRUSTED key"
 msgstr "Signatur Status: Erstellt mit einem NICHT vertrauenswürdigem Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:191
+#: Src/wptClipDecryptDlg.cpp:192
 msgid "Signature Status: Created with an undefined trusted key"
 msgstr "Signatur Status: Erstellt mit einem undefinierten Schlüssel"
 
-#: Src/wptClipDecryptDlg.cpp:200
+#: Src/wptClipDecryptDlg.cpp:201
 msgid "WinPT Verify"
 msgstr "WinPT Überprüfung"
 
-#: Src/wptClipDecryptDlg.cpp:201
+#: Src/wptClipDecryptDlg.cpp:202
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
-"Signature made %s\n"
+"Signature made: %s\n"
 "From \"%s\" using key ID 0x%s%s %s"
 msgstr ""
 "%s\n"
 "%s\n"
-"Signatur erstellt %s\n"
+"Signatur erstellt: %s\n"
 "Von \"%s\" mit Schlüssel ID 0x%s%s %s"
 
 #: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
 #: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
 #: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:245
-#: Src/wptClipEditDlg.cpp:250 Src/wptMainProc.cpp:160 Src/wptMainProc.cpp:228
-#: Src/wptMainProc.cpp:271 Src/wptMainProc.cpp:430 Src/wptMainProc.cpp:511
-#: Src/wptMainProc.cpp:515
+#: Src/wptClipEditDlg.cpp:250 Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:227
+#: Src/wptMainProc.cpp:270 Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:509
+#: Src/wptMainProc.cpp:513
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:572
+#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:574
 msgid "File Open"
 msgstr "Datei öffnen"
 
 #: Src/wptClipEditDlg.cpp:102 Src/wptClipEditDlg.cpp:150
-#: Src/wptFileManager.cpp:573 Src/wptW32API.cpp:107
+#: Src/wptFileManager.cpp:575 Src/wptW32API.cpp:122
 msgid "All Files (*.*)"
 msgstr ""
 
@@ -533,7 +537,7 @@
 msgid "File Save"
 msgstr "Datei speichern"
 
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:107
+#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:109
 #, c-format
 msgid ""
 "\"%s\" already exists.\n"
@@ -542,8 +546,8 @@
 "\"%s\" existiert bereits.\n"
 "Vorhandene Datei überschreiben?"
 
-#: Src/wptClipEditDlg.cpp:196 Src/wptMainProc.cpp:170 Src/wptMainProc.cpp:236
-#: Src/wptMainProc.cpp:569
+#: Src/wptClipEditDlg.cpp:196 Src/wptMainProc.cpp:169 Src/wptMainProc.cpp:235
+#: Src/wptMainProc.cpp:563
 msgid "Clipboard Editor"
 msgstr "Zwischenablagen-Editor"
 
@@ -569,8 +573,8 @@
 msgid "Add quotes"
 msgstr "'>' hinzufügen"
 
-#: Src/wptClipEditDlg.cpp:202 Src/wptKeyEditDlgs.cpp:1801
-#: Src/wptKeyserverDlg.cpp:446 Src/wptMDSumDlg.cpp:87
+#: Src/wptClipEditDlg.cpp:202 Src/wptKeyEditDlgs.cpp:1804
+#: Src/wptKeyserverDlg.cpp:448 Src/wptMDSumDlg.cpp:87
 #: Src/wptOwnertrustDlg.cpp:103
 msgid "&Close"
 msgstr "&Schliessen"
@@ -581,9 +585,9 @@
 msgstr "Empfänger nicht geeignet für Verschlüsselung\n"
 
 #: Src/wptClipEncryptDlg.cpp:119 Src/wptClipEncryptDlg.cpp:140
-#: Src/wptClipEncryptDlg.cpp:194 Src/wptClipEncryptDlg.cpp:201
-#: Src/wptClipEncryptDlg.cpp:232 Src/wptMainProc.cpp:142
-#: Src/wptMainProc.cpp:210
+#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipEncryptDlg.cpp:199
+#: Src/wptClipEncryptDlg.cpp:230 Src/wptMainProc.cpp:141
+#: Src/wptMainProc.cpp:209
 msgid "Encryption"
 msgstr "Verschlüsseln"
 
@@ -593,24 +597,24 @@
 
 #: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
 #: Src/wptCommonDlg.cpp:66 Src/wptFileManagerDlg.cpp:84
-#: Src/wptFileManagerDlg.cpp:198 Src/wptFileManagerDlg.cpp:275
+#: Src/wptFileManagerDlg.cpp:215 Src/wptFileManagerDlg.cpp:277
 #: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:50
 #: Src/wptKeyEditDlgs.cpp:288 Src/wptKeyEditDlgs.cpp:388
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:597
+#: Src/wptKeyEditDlgs.cpp:463 Src/wptKeyEditDlgs.cpp:599
 #: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:394
-#: Src/wptKeygenDlg.cpp:597 Src/wptKeyRevokeDlg.cpp:90
+#: Src/wptKeygenDlg.cpp:597 Src/wptKeyRevokeDlg.cpp:101
 #: Src/wptKeyserverSearchDlg.cpp:63 Src/wptKeysignDlg.cpp:258
 #: Src/wptPassphraseCB.cpp:83 Src/wptPassphraseDlg.cpp:68 Src/wptPINDlg.cpp:55
 #: Src/wptPreferencesDlg.cpp:149 Src/wptTextInputDlg.cpp:84
 msgid "&Cancel"
 msgstr "&Abbrechen"
 
-#: Src/wptClipEncryptDlg.cpp:194 Src/wptClipSignEncDlg.cpp:159
+#: Src/wptClipEncryptDlg.cpp:192 Src/wptClipSignEncDlg.cpp:157
 msgid "You must select at least one key."
 msgstr "Sie müssen wenigstens einen Schlüssel auswählen."
 
 # c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:229
-#: Src/wptClipEncryptDlg.cpp:232
+#: Src/wptClipEncryptDlg.cpp:230
 #, c-format
 msgid "No recipient found with '%s'"
 msgstr "Keine Empfaenger mit '%s' gefunden"
@@ -619,12 +623,12 @@
 msgid "Key Import Statistics"
 msgstr "Schlüsselimport-Statistiken"
 
-#: Src/wptClipImportDlg.cpp:88 Src/wptFileManagerDlg.cpp:197
-#: Src/wptFileManagerDlg.cpp:203 Src/wptKeyManager.cpp:468
+#: Src/wptClipImportDlg.cpp:88 Src/wptFileManagerDlg.cpp:201
+#: Src/wptFileManagerDlg.cpp:214 Src/wptKeyManager.cpp:475
 msgid "Key Import"
 msgstr "Schlüsselimport"
 
-#: Src/wptClipImportDlg.cpp:89 Src/wptFileManagerDlg.cpp:468
+#: Src/wptClipImportDlg.cpp:89 Src/wptFileManagerDlg.cpp:469
 msgid "&Import"
 msgstr "&Importieren"
 
@@ -641,11 +645,11 @@
 "manuell in den Schlüsseleigenschaften setzen."
 
 #: Src/wptClipImportDlg.cpp:122 Src/wptClipImportDlg.cpp:151
-#: Src/wptClipImportDlg.cpp:161 Src/wptFileManager.cpp:1651
-#: Src/wptFileManager.cpp:1662 Src/wptImportList.cpp:414
+#: Src/wptClipImportDlg.cpp:161 Src/wptFileManager.cpp:1653
+#: Src/wptFileManager.cpp:1664 Src/wptImportList.cpp:414
 #: Src/wptImportList.cpp:421 Src/wptImportList.cpp:430
 #: Src/wptImportList.cpp:438 Src/wptImportList.cpp:447
-#: Src/wptKeyManager.cpp:575 Src/wptKeyserverDlg.cpp:217
+#: Src/wptKeyManager.cpp:582 Src/wptKeyserverDlg.cpp:219
 msgid "Import"
 msgstr "Importieren"
 
@@ -661,22 +665,22 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren."
 
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:187
-#: Src/wptClipSignEncDlg.cpp:178
+#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:185
+#: Src/wptClipSignEncDlg.cpp:176
 msgid "Could not get default key."
 msgstr "Konnte den Standardschlüssel nicht finden"
 
 #: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:112
 #: Src/wptClipSignDlg.cpp:117 Src/wptClipSignDlg.cpp:141
-#: Src/wptClipSignDlg.cpp:187 Src/wptClipSignDlg.cpp:195
-#: Src/wptClipSignDlg.cpp:214 Src/wptClipSignDlg.cpp:226
-#: Src/wptClipSignEncDlg.cpp:168 Src/wptClipSignEncDlg.cpp:178
-#: Src/wptFileManager.cpp:1083 Src/wptFileManager.cpp:1101
-#: Src/wptFileManager.cpp:1363 Src/wptMainProc.cpp:154 Src/wptMainProc.cpp:216
+#: Src/wptClipSignDlg.cpp:185 Src/wptClipSignDlg.cpp:193
+#: Src/wptClipSignDlg.cpp:212 Src/wptClipSignDlg.cpp:224
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptClipSignEncDlg.cpp:176
+#: Src/wptFileManager.cpp:1085 Src/wptFileManager.cpp:1103
+#: Src/wptFileManager.cpp:1365 Src/wptMainProc.cpp:153 Src/wptMainProc.cpp:215
 msgid "Signing"
 msgstr "Signieren"
 
-#: Src/wptClipSignDlg.cpp:196
+#: Src/wptClipSignDlg.cpp:194
 #, c-format
 msgid ""
 "No key was chosen.\n"
@@ -685,22 +689,22 @@
 "Kein Schlüssel ausgewählt.\n"
 "GPG-Standard-Schlüssel '%s' benutzen??"
 
-#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:160
-#: Src/wptClipSignEncDlg.cpp:187 Src/wptClipSignEncDlg.cpp:196
-#: Src/wptMainProc.cpp:148 Src/wptMainProc.cpp:222
+#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:158
+#: Src/wptClipSignEncDlg.cpp:185 Src/wptClipSignEncDlg.cpp:194
+#: Src/wptMainProc.cpp:147 Src/wptMainProc.cpp:221
 msgid "Sign & Encrypt"
 msgstr "Signieren & Verschlüsseln"
 
 # c:\oss\winpt-gpgme\src\wptClipSignEncDlg.cpp:121
-#: Src/wptClipSignEncDlg.cpp:122
+#: Src/wptClipSignEncDlg.cpp:121
 msgid "Select key for signing"
 msgstr "Schlüssel zum Signieren auswählen"
 
-#: Src/wptClipSignEncDlg.cpp:123
+#: Src/wptClipSignEncDlg.cpp:122
 msgid "Signing key:"
 msgstr "Signierer Schlüssel:"
 
-#: Src/wptClipSignEncDlg.cpp:168 Src/wptKeylist.cpp:1121
+#: Src/wptClipSignEncDlg.cpp:166 Src/wptKeylist.cpp:1170
 msgid "No key was selected."
 msgstr "Kein Schlüssel ausgewählt."
 
@@ -711,11 +715,11 @@
 #: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
 #: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
 #: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1549 Src/wptFileManager.cpp:1604
-#: Src/wptFileManagerDlg.cpp:541 Src/wptFileVerifyDlg.cpp:81
-#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:180
-#: Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:258 Src/wptMainProc.cpp:266
-#: Src/wptMainProc.cpp:418
+#: Src/wptFileManager.cpp:1551 Src/wptFileManager.cpp:1606
+#: Src/wptFileManagerDlg.cpp:542 Src/wptFileVerifyDlg.cpp:81
+#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:179
+#: Src/wptMainProc.cpp:245 Src/wptMainProc.cpp:257 Src/wptMainProc.cpp:265
+#: Src/wptMainProc.cpp:416
 msgid "Verify"
 msgstr "Überprüfen"
 
@@ -744,7 +748,7 @@
 msgid "The signature is expired!"
 msgstr "Signatur ist abgelaufen!"
 
-#: Src/wptClipVerifyDlg.cpp:268 Src/wptFileSaveDlg.cpp:57
+#: Src/wptClipVerifyDlg.cpp:266 Src/wptFileSaveDlg.cpp:57
 #: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
 #: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
 #: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
@@ -763,30 +767,30 @@
 msgid "Please enter a valid URL."
 msgstr "Bitte eine gültige URL eingeben."
 
-#: Src/wptCommonDlg.cpp:123 Src/wptKeyEditDlgs.cpp:706
-#: Src/wptKeyEditDlgs.cpp:777 Src/wptKeyEditDlgs.cpp:813
-#: Src/wptKeyEditDlgs.cpp:825 Src/wptKeyEditDlgs.cpp:893
-#: Src/wptKeyEditDlgs.cpp:900 Src/wptKeyEditDlgs.cpp:918
-#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditDlgs.cpp:970
-#: Src/wptKeyEditDlgs.cpp:1061 Src/wptKeyEditDlgs.cpp:1067
-#: Src/wptKeyEditDlgs.cpp:1219 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1227 Src/wptKeyEditDlgs.cpp:1232
-#: Src/wptKeyEditDlgs.cpp:1268 Src/wptKeyEditDlgs.cpp:1272
-#: Src/wptKeyEditDlgs.cpp:1282 Src/wptKeyEditDlgs.cpp:1297
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1341
-#: Src/wptKeyEditDlgs.cpp:1346 Src/wptKeyEditDlgs.cpp:1353
-#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1364
-#: Src/wptKeyEditDlgs.cpp:1405 Src/wptKeyEditDlgs.cpp:1410
-#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1423
-#: Src/wptKeyEditDlgs.cpp:1426 Src/wptKeyEditDlgs.cpp:1463
-#: Src/wptKeyEditDlgs.cpp:1471 Src/wptKeyEditDlgs.cpp:1505
-#: Src/wptKeyEditDlgs.cpp:1513 Src/wptKeyEditDlgs.cpp:1611
-#: Src/wptKeyEditDlgs.cpp:1644 Src/wptKeyEditDlgs.cpp:1669
-#: Src/wptKeyEditDlgs.cpp:1673 Src/wptKeyEditDlgs.cpp:1682
-#: Src/wptKeyEditDlgs.cpp:1782 Src/wptKeyEditDlgs.cpp:1792
-#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1832
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeyManagerDlg.cpp:889
-#: Src/wptKeyManagerDlg.cpp:1544
+#: Src/wptCommonDlg.cpp:123 Src/wptKeyEditDlgs.cpp:708
+#: Src/wptKeyEditDlgs.cpp:779 Src/wptKeyEditDlgs.cpp:815
+#: Src/wptKeyEditDlgs.cpp:827 Src/wptKeyEditDlgs.cpp:896
+#: Src/wptKeyEditDlgs.cpp:903 Src/wptKeyEditDlgs.cpp:921
+#: Src/wptKeyEditDlgs.cpp:968 Src/wptKeyEditDlgs.cpp:973
+#: Src/wptKeyEditDlgs.cpp:1064 Src/wptKeyEditDlgs.cpp:1070
+#: Src/wptKeyEditDlgs.cpp:1222 Src/wptKeyEditDlgs.cpp:1226
+#: Src/wptKeyEditDlgs.cpp:1230 Src/wptKeyEditDlgs.cpp:1235
+#: Src/wptKeyEditDlgs.cpp:1271 Src/wptKeyEditDlgs.cpp:1275
+#: Src/wptKeyEditDlgs.cpp:1285 Src/wptKeyEditDlgs.cpp:1300
+#: Src/wptKeyEditDlgs.cpp:1304 Src/wptKeyEditDlgs.cpp:1344
+#: Src/wptKeyEditDlgs.cpp:1349 Src/wptKeyEditDlgs.cpp:1356
+#: Src/wptKeyEditDlgs.cpp:1362 Src/wptKeyEditDlgs.cpp:1367
+#: Src/wptKeyEditDlgs.cpp:1408 Src/wptKeyEditDlgs.cpp:1413
+#: Src/wptKeyEditDlgs.cpp:1419 Src/wptKeyEditDlgs.cpp:1426
+#: Src/wptKeyEditDlgs.cpp:1429 Src/wptKeyEditDlgs.cpp:1466
+#: Src/wptKeyEditDlgs.cpp:1474 Src/wptKeyEditDlgs.cpp:1508
+#: Src/wptKeyEditDlgs.cpp:1516 Src/wptKeyEditDlgs.cpp:1614
+#: Src/wptKeyEditDlgs.cpp:1647 Src/wptKeyEditDlgs.cpp:1672
+#: Src/wptKeyEditDlgs.cpp:1676 Src/wptKeyEditDlgs.cpp:1685
+#: Src/wptKeyEditDlgs.cpp:1785 Src/wptKeyEditDlgs.cpp:1795
+#: Src/wptKeyEditDlgs.cpp:1806 Src/wptKeyEditDlgs.cpp:1835
+#: Src/wptKeyEditDlgs.cpp:1841 Src/wptKeyManagerDlg.cpp:958
+#: Src/wptKeyManagerDlg.cpp:1622
 msgid "Key Edit"
 msgstr "Schlüssel bearbeiten"
 
@@ -1062,18 +1066,18 @@
 msgid "Unknown error=%d"
 msgstr "Unbekannter Fehler=%d"
 
-#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
-#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:666
-#: Src/wptFileManager.cpp:811 Src/wptFileManager.cpp:925
-#: Src/wptFileManager.cpp:1454 Src/wptFileManager.cpp:1481
-#: Src/wptFileManager.cpp:1500 Src/wptFileManager.cpp:1777
-#: Src/wptFileManager.cpp:1839 Src/wptFileManagerDlg.cpp:488
-#: Src/wptFileStatDlg.cpp:137 Src/wptMainProc.cpp:399 Src/wptMDSumDlg.cpp:124
+#: Src/wptFileManager.cpp:108 Src/wptFileManager.cpp:130
+#: Src/wptFileManager.cpp:136 Src/wptFileManager.cpp:175
+#: Src/wptFileManager.cpp:300 Src/wptFileManager.cpp:668
+#: Src/wptFileManager.cpp:813 Src/wptFileManager.cpp:927
+#: Src/wptFileManager.cpp:1456 Src/wptFileManager.cpp:1483
+#: Src/wptFileManager.cpp:1502 Src/wptFileManager.cpp:1760
+#: Src/wptFileManager.cpp:1822 Src/wptFileManagerDlg.cpp:489
+#: Src/wptFileStatDlg.cpp:137 Src/wptMainProc.cpp:397 Src/wptMDSumDlg.cpp:124
 msgid "File Manager"
 msgstr "Dateimanager"
 
-#: Src/wptFileManager.cpp:129
+#: Src/wptFileManager.cpp:131
 #, c-format
 msgid ""
 "\"%s\" has read-only attribute.\n"
@@ -1082,12 +1086,12 @@
 "\"%s\" hat Attribut: Nur-Lesen.\n"
 "Auf Standard setzen?"
 
-#: Src/wptFileManager.cpp:133
+#: Src/wptFileManager.cpp:135
 msgid "Could not reset file attribute to normal."
-msgstr "Konnte Dateiattribut nicht zurücksetzen."
+msgstr "Konnte Datei-Attribut nicht auf normal zurücksetzen"
 
 # c:\oss\winpt-gpgme\src\wptFileManager.cpp:147
-#: Src/wptFileManager.cpp:169
+#: Src/wptFileManager.cpp:171
 msgid ""
 "Multi-Media files are already compressed, GPG would compress\n"
 "them anyway and this costs a lot of time.\n"
@@ -1100,26 +1104,26 @@
 "\n"
 "Möchten Sie die Kompression ausschalten?"
 
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:952
-#: Src/wptVerifyList.cpp:88 Src/wptVerifyList.cpp:96
+#: Src/wptFileManager.cpp:383 Src/wptKeyEditDlgs.cpp:955
+#: Src/wptVerifyList.cpp:98 Src/wptVerifyList.cpp:106
 msgid "Status"
 msgstr "Status"
 
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1053
-#: Src/wptKeyRevokersDlg.cpp:52 Src/wptMDSumDlg.cpp:57
-#: Src/wptVerifyList.cpp:87
+#: Src/wptFileManager.cpp:384 Src/wptKeyEditDlgs.cpp:1056
+#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:57
+#: Src/wptVerifyList.cpp:97
 msgid "Name"
 msgstr "Name"
 
-#: Src/wptFileManager.cpp:383
+#: Src/wptFileManager.cpp:385
 msgid "Operation"
 msgstr "Prozess"
 
-#: Src/wptFileManager.cpp:666
+#: Src/wptFileManager.cpp:668
 msgid "Please select a file."
 msgstr "Bitte eine Datei auswählen."
 
-#: Src/wptFileManager.cpp:812
+#: Src/wptFileManager.cpp:814
 #, c-format
 msgid ""
 "\"%s\" does not seems to be a text file.\n"
@@ -1128,53 +1132,53 @@
 "\"%s\" scheint keine Text-Datei zu sein.\n"
 "Möchsten Sie wirklich diese Datei signieren?"
 
-#: Src/wptFileManager.cpp:926
+#: Src/wptFileManager.cpp:928
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "\"%s\" existiert nicht"
 
-#: Src/wptFileManager.cpp:1007 Src/wptFileStatDlg.cpp:259
+#: Src/wptFileManager.cpp:1009 Src/wptFileStatDlg.cpp:259
 #: Src/wptFileStatDlg.cpp:266
 msgid "File Status"
 msgstr "Dateistatus"
 
-#: Src/wptFileManager.cpp:1053
+#: Src/wptFileManager.cpp:1055
 msgid "Enter filename for encrypted file"
 msgstr "Wählen Sie einen Namen für die verschlüsselte Datei"
 
-#: Src/wptFileManager.cpp:1082
+#: Src/wptFileManager.cpp:1084
 msgid "Could not get default secret key."
 msgstr "Konnte den geheimen Standardschlüssel nicht finden"
 
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1399
-#: Src/wptFileManagerDlg.cpp:539 Src/wptMainProc.cpp:198
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:422
+#: Src/wptFileManager.cpp:1117 Src/wptFileManager.cpp:1401
+#: Src/wptFileManagerDlg.cpp:540 Src/wptMainProc.cpp:197
+#: Src/wptMainProc.cpp:413 Src/wptMainProc.cpp:420
 msgid "Sign"
 msgstr "Signieren"
 
-#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:537
-#: Src/wptMainProc.cpp:414 Src/wptMainProc.cpp:419
+#: Src/wptFileManager.cpp:1130 Src/wptFileManagerDlg.cpp:538
+#: Src/wptMainProc.cpp:412 Src/wptMainProc.cpp:417
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1186
-#: Src/wptFileManager.cpp:1191 Src/wptMainProc.cpp:413
+#: Src/wptFileManager.cpp:1157 Src/wptFileManager.cpp:1188
+#: Src/wptFileManager.cpp:1193 Src/wptMainProc.cpp:411
 msgid "Symmetric"
 msgstr "Symmetrisch"
 
-#: Src/wptFileManager.cpp:1191
+#: Src/wptFileManager.cpp:1193
 msgid "Encryption failed."
 msgstr "Verschlüsselung fehlgeschlagen."
 
-#: Src/wptFileManager.cpp:1218
+#: Src/wptFileManager.cpp:1220
 msgid "Good signature"
 msgstr "Korrekte Signatur"
 
-#: Src/wptFileManager.cpp:1218
+#: Src/wptFileManager.cpp:1220
 msgid "BAD signature"
 msgstr "Falsche Signatur"
 
-#: Src/wptFileManager.cpp:1226
+#: Src/wptFileManager.cpp:1228
 #, c-format
 msgid ""
 "Signature made %s using %s key ID %s\n"
@@ -1183,23 +1187,23 @@
 "Signatur erstellt %s mit %s key ID %s\n"
 "%s von \"%s\""
 
-#: Src/wptFileManager.cpp:1231
+#: Src/wptFileManager.cpp:1233
 msgid "Decrypt Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
-#: Src/wptFileManager.cpp:1279
+#: Src/wptFileManager.cpp:1281
 msgid "Choose Filename for Output"
 msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1290
+#: Src/wptFileManager.cpp:1292
 msgid "Please enter filename for plaintext file"
 msgstr "Wählen Sie einen Namen für die Klartext-Datei"
 
-#: Src/wptFileManager.cpp:1328 Src/wptFileManagerDlg.cpp:538
+#: Src/wptFileManager.cpp:1330 Src/wptFileManagerDlg.cpp:539
 msgid "Decrypt"
 msgstr "Entschlüsseln"
 
-#: Src/wptFileManager.cpp:1334
+#: Src/wptFileManager.cpp:1336
 #, c-format
 msgid ""
 "Decryption failed.\n"
@@ -1208,32 +1212,32 @@
 "Entshlüsselung fehlgeschlagen.\n"
 "%s: existiert nicht."
 
-#: Src/wptFileManager.cpp:1376
+#: Src/wptFileManager.cpp:1378
 msgid "Enter filename for signed file"
 msgstr "Wählen Sie einen Namen für die signierte Datei"
 
-#: Src/wptFileManager.cpp:1480
+#: Src/wptFileManager.cpp:1482
 msgid "Could not find detached signature in the clipboard."
 msgstr "Konnte \"detached\" Signatur in der Zwischenablage nicht finden."
 
 # c:\oss\winpt-gpgme\src\wptFileManager.cpp:1362
-#: Src/wptFileManager.cpp:1500
+#: Src/wptFileManager.cpp:1502
 msgid "No files to check."
 msgstr "Keine Datei(en) zu pruefen"
 
-#: Src/wptFileManager.cpp:1517
+#: Src/wptFileManager.cpp:1519
 msgid "Select Data File"
 msgstr "Bitte Datendatei auswählen"
 
-#: Src/wptFileManager.cpp:1519
+#: Src/wptFileManager.cpp:1521
 msgid "Selected Output File"
 msgstr "Bitte Ausgabedatei auswählen"
 
-#: Src/wptFileManager.cpp:1549
+#: Src/wptFileManager.cpp:1551
 msgid "Invalid file name. Exit"
 msgstr "Ungültiger Dateiname. Abbruch"
 
-#: Src/wptFileManager.cpp:1659 Src/wptKeyManager.cpp:572
+#: Src/wptFileManager.cpp:1661 Src/wptKeyManager.cpp:579
 msgid ""
 "Key without a self signature was dectected!\n"
 "(This key is NOT usable for encryption, etc)\n"
@@ -1245,58 +1249,58 @@
 "\n"
 "Kann diese(n) Schlüssel nicht importieren!"
 
-#: Src/wptFileManager.cpp:1704 Src/wptKeyManager.cpp:300
-#: Src/wptKeyManager.cpp:336 Src/wptKeyManager.cpp:371
+#: Src/wptFileManager.cpp:1687 Src/wptKeyManager.cpp:306
+#: Src/wptKeyManager.cpp:342 Src/wptKeyManager.cpp:378
 msgid "No key was selected for export."
 msgstr "Kein Schlüssel zum Exportieren ausgewählt."
 
-#: Src/wptFileManager.cpp:1704 Src/wptFileManager.cpp:1727
-#: Src/wptKeyserverDlg.cpp:84
+#: Src/wptFileManager.cpp:1687 Src/wptFileManager.cpp:1710
+#: Src/wptKeyserverDlg.cpp:85
 msgid "Export"
 msgstr "Exportieren"
 
-#: Src/wptFileManager.cpp:1712 Src/wptKeyManagerDlg.cpp:1477
-#: Src/wptKeyManagerDlg.cpp:1509
+#: Src/wptFileManager.cpp:1695 Src/wptKeyManagerDlg.cpp:1551
+#: Src/wptKeyManagerDlg.cpp:1585
 msgid "Choose Name for Key File"
-msgstr "Namen für Schlüsseldatei auswählen"
+msgstr "Den Namen der Schlüsseldatei wählen"
 
-#: Src/wptFileManager.cpp:1731 Src/wptKeyEditDlgs.cpp:933
-#: Src/wptKeyEditDlgs.cpp:1249 Src/wptKeyEditDlgs.cpp:1320
-#: Src/wptKeyserverDlg.cpp:95
+#: Src/wptFileManager.cpp:1714 Src/wptKeyEditDlgs.cpp:936
+#: Src/wptKeyEditDlgs.cpp:1252 Src/wptKeyEditDlgs.cpp:1323
+#: Src/wptKeyserverDlg.cpp:96
 msgid "GnuPG status"
 msgstr "GnuPG Status"
 
-#: Src/wptFileManager.cpp:1731
+#: Src/wptFileManager.cpp:1714
 #, c-format
 msgid "Finished (Output: %s)"
 msgstr "Fertig (Datei: %s)"
 
-#: Src/wptFileManager.cpp:1778
+#: Src/wptFileManager.cpp:1761
 #, c-format
 msgid "%s: no valid OpenPGP data found."
 msgstr "%s: keine gültigen OpenPGP-Daten gefunden."
 
-#: Src/wptFileManager.cpp:1838
+#: Src/wptFileManager.cpp:1821
 msgid "Encrypting into a ZIP archive makes sense with multiple files"
 msgstr ""
 
-#: Src/wptFileManager.cpp:1843
+#: Src/wptFileManager.cpp:1826
 msgid "Choose File Name for Output"
-msgstr "Namen für die Ausgabedatei auswählen"
+msgstr "Wählen Sie einen Namen für die Ausgabedatei"
 
-#: Src/wptFileManager.cpp:1912
+#: Src/wptFileManager.cpp:1895
 msgid "Choose a Name for the Archive"
 msgstr "Wählen Sie den Namen für das Archiv"
 
-#: Src/wptFileManager.cpp:1915
+#: Src/wptFileManager.cpp:1898
 msgid "Invalid archive name. Exit."
 msgstr "Ungültiger Archivename. Abbruch."
 
-#: Src/wptFileManager.cpp:1915 Src/wptFileManager.cpp:1922
+#: Src/wptFileManager.cpp:1898 Src/wptFileManager.cpp:1905
 msgid "Encrypt Directory"
 msgstr "Verzeichnis verschlüsseln"
 
-#: Src/wptFileManager.cpp:1922
+#: Src/wptFileManager.cpp:1905
 msgid "Could not create zip archive."
 msgstr "Konnte ZIP-Datei nicht erstellen"
 
@@ -1324,17 +1328,17 @@
 msgid "Please select at least one recipient."
 msgstr "Bitte wählen Sie wenigstens einen Empfänger"
 
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:266
-#: Src/wptKeyManager.cpp:446
+#: Src/wptFileManagerDlg.cpp:201 Src/wptFileStatDlg.cpp:266
+#: Src/wptKeyManager.cpp:453
 msgid "No valid OpenPGP data found."
 msgstr "Keine gültigen OpenPGP-Daten gefunden."
 
-#: Src/wptFileManagerDlg.cpp:208
+#: Src/wptFileManagerDlg.cpp:206
 #, c-format
 msgid "File contain(s) %d key(s)."
 msgstr "Datei enthält %d Schlüssel."
 
-#: Src/wptFileManagerDlg.cpp:270 Src/wptFileManagerDlg.cpp:320
+#: Src/wptFileManagerDlg.cpp:270 Src/wptFileManagerDlg.cpp:322
 msgid "File Sign"
 msgstr "Datei signieren"
 
@@ -1350,164 +1354,172 @@
 msgid "&Cleartext Signature"
 msgstr "&Klartextsignatur"
 
-#: Src/wptFileManagerDlg.cpp:320 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1272 Src/wptKeyEditDlgs.cpp:1346
-#: Src/wptKeyManager.cpp:612 Src/wptKeyManager.cpp:710
-#: Src/wptKeyManager.cpp:746 Src/wptKeyManagerDlg.cpp:1249
-#: Src/wptKeyManagerDlg.cpp:1268 Src/wptKeyManagerDlg.cpp:1301
-#: Src/wptKeyManagerDlg.cpp:1320 Src/wptKeyManagerDlg.cpp:1336
-#: Src/wptKeyManagerDlg.cpp:1468 Src/wptKeyManagerDlg.cpp:1486
+#: Src/wptFileManagerDlg.cpp:275
+msgid "Signature mode"
+msgstr "Signaturmodus"
+
+#: Src/wptFileManagerDlg.cpp:276 Src/wptKeyManagerDlg.cpp:922
+msgid "Options"
+msgstr "Optionen"
+
+#: Src/wptFileManagerDlg.cpp:322 Src/wptKeyEditDlgs.cpp:1226
+#: Src/wptKeyEditDlgs.cpp:1275 Src/wptKeyEditDlgs.cpp:1349
+#: Src/wptKeyManager.cpp:619 Src/wptKeyManager.cpp:717
+#: Src/wptKeyManager.cpp:754 Src/wptKeyManagerDlg.cpp:1319
+#: Src/wptKeyManagerDlg.cpp:1338 Src/wptKeyManagerDlg.cpp:1372
+#: Src/wptKeyManagerDlg.cpp:1391 Src/wptKeyManagerDlg.cpp:1408
+#: Src/wptKeyManagerDlg.cpp:1541 Src/wptKeyManagerDlg.cpp:1560
 #: Src/wptKeyserverSearchDlg.cpp:127
 msgid "Please select a key."
 msgstr "Bitte Schlüssel wählen."
 
-#: Src/wptFileManagerDlg.cpp:381
+#: Src/wptFileManagerDlg.cpp:382
 msgid "0 Objects marked"
 msgstr "0 Objekte markiert"
 
-#: Src/wptFileManagerDlg.cpp:385
+#: Src/wptFileManagerDlg.cpp:386
 #, c-format
 msgid "%d Object(s) marked"
 msgstr "%d Objekt(e) markiert"
 
-#: Src/wptFileManagerDlg.cpp:455 Src/wptMainProc.cpp:548
+#: Src/wptFileManagerDlg.cpp:456 Src/wptMainProc.cpp:542
 msgid "File Manager (use drag & drop to add files)"
 msgstr "Dateimanager (Drag & Drop möglich)"
 
-#: Src/wptFileManagerDlg.cpp:457 Src/wptKeyManagerDlg.cpp:831
+#: Src/wptFileManagerDlg.cpp:458 Src/wptKeyManagerDlg.cpp:895
 #: Src/wptOwnertrustDlg.cpp:98
 msgid "File"
 msgstr "Datei"
 
-#: Src/wptFileManagerDlg.cpp:458 Src/wptKeyManagerDlg.cpp:832
-#: Src/wptKeyManagerDlg.cpp:837 Src/wptKeyManagerDlg.cpp:848
+#: Src/wptFileManagerDlg.cpp:459 Src/wptKeyManagerDlg.cpp:896
+#: Src/wptKeyManagerDlg.cpp:901 Src/wptKeyManagerDlg.cpp:912
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: Src/wptFileManagerDlg.cpp:459 Src/wptKeyManagerDlg.cpp:833
+#: Src/wptFileManagerDlg.cpp:460 Src/wptKeyManagerDlg.cpp:897
 msgid "View"
 msgstr "Ansicht"
 
-#: Src/wptFileManagerDlg.cpp:460
+#: Src/wptFileManagerDlg.cpp:461
 msgid "&Open..."
 msgstr "Ö&ffnen.."
 
-#: Src/wptFileManagerDlg.cpp:461
+#: Src/wptFileManagerDlg.cpp:462
 msgid "&Encrypt"
 msgstr "&Verschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:462 Src/wptFileManagerDlg.cpp:536
+#: Src/wptFileManagerDlg.cpp:463 Src/wptFileManagerDlg.cpp:537
 msgid "Encrypt into ZIP"
 msgstr "Verschlüsseln in ZIP"
 
-#: Src/wptFileManagerDlg.cpp:463
+#: Src/wptFileManagerDlg.cpp:464
 msgid "&Decrypt"
 msgstr "&Entschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:464 Src/wptKeyManagerDlg.cpp:849
-#: Src/wptKeyManagerDlg.cpp:892
+#: Src/wptFileManagerDlg.cpp:465 Src/wptKeyManagerDlg.cpp:913
+#: Src/wptKeyManagerDlg.cpp:961
 msgid "&Sign"
 msgstr "&Signieren"
 
-#: Src/wptFileManagerDlg.cpp:465 Src/wptFileManagerDlg.cpp:540
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:420
+#: Src/wptFileManagerDlg.cpp:466 Src/wptFileManagerDlg.cpp:541
+#: Src/wptMainProc.cpp:414 Src/wptMainProc.cpp:418
 msgid "Sign && Encrypt"
 msgstr "Signieren && Verschlüsseln"
 
-#: Src/wptFileManagerDlg.cpp:466
+#: Src/wptFileManagerDlg.cpp:467
 msgid "&Verify"
 msgstr "Über&prüfen"
 
-#: Src/wptFileManagerDlg.cpp:467
+#: Src/wptFileManagerDlg.cpp:468
 msgid "S&ymmetric"
 msgstr "S&ymmetrisch"
 
-#: Src/wptFileManagerDlg.cpp:469
+#: Src/wptFileManagerDlg.cpp:470
 msgid "E&xport"
 msgstr "E&xportieren"
 
 # msgid "Executable Files (*.exe)"
 # msgstr "Ausführbare Dateien (*.exe)"
-#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:412
+#: Src/wptFileManagerDlg.cpp:471 Src/wptMainProc.cpp:410
 msgid "Exit"
 msgstr "Beenden"
 
-#: Src/wptFileManagerDlg.cpp:471
+#: Src/wptFileManagerDlg.cpp:472
 msgid "&Reset"
 msgstr "&Reset"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:421
-#: Src/wptFileManagerDlg.cpp:472
+#: Src/wptFileManagerDlg.cpp:473
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
-#: Src/wptFileManagerDlg.cpp:473
+#: Src/wptFileManagerDlg.cpp:474
 msgid "&Paste"
 msgstr "&Einfügen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:423
-#: Src/wptFileManagerDlg.cpp:474
+#: Src/wptFileManagerDlg.cpp:475
 msgid "&Select All"
 msgstr "Alles &markieren"
 
-#: Src/wptFileManagerDlg.cpp:475
+#: Src/wptFileManagerDlg.cpp:476
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:476 Src/wptFileManagerDlg.cpp:543
+#: Src/wptFileManagerDlg.cpp:477 Src/wptFileManagerDlg.cpp:544
 msgid "Send as Mail"
 msgstr "Als Mail versenden"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:425
-#: Src/wptFileManagerDlg.cpp:477
+#: Src/wptFileManagerDlg.cpp:478
 msgid "&List Packets"
 msgstr "Pakete an&zeigen"
 
-#: Src/wptFileManagerDlg.cpp:479
+#: Src/wptFileManagerDlg.cpp:480
 msgid "&Wipe"
 msgstr "&Löschen"
 
-#: Src/wptFileManagerDlg.cpp:487
+#: Src/wptFileManagerDlg.cpp:488
 msgid "Could not set filelist window procedure."
 msgstr "Konnte \"filelist window procedure\" nicht setzen."
 
-#: Src/wptFileManagerDlg.cpp:542
+#: Src/wptFileManagerDlg.cpp:543
 msgid "Wipe"
 msgstr "Löschen"
 
-#: Src/wptFileManagerDlg.cpp:544
+#: Src/wptFileManagerDlg.cpp:545
 msgid "List Packets"
 msgstr "Pakete anzeigen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:589
+#: Src/wptFileManagerDlg.cpp:590
 msgid "&Calc Digest"
 msgstr "Digest &berechnen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:744
+#: Src/wptFileManagerDlg.cpp:745
 msgid "Are you sure you want to secure delete these files?"
 msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
 
-#: Src/wptFileManagerDlg.cpp:745 Src/wptMainProc.cpp:98
+#: Src/wptFileManagerDlg.cpp:746 Src/wptMainProc.cpp:97
 msgid "&Yes"
 msgstr "&Ja"
 
-#: Src/wptFileManagerDlg.cpp:746 Src/wptMainProc.cpp:99
+#: Src/wptFileManagerDlg.cpp:747 Src/wptMainProc.cpp:98
 msgid "&No"
 msgstr "&Nein"
 
-#: Src/wptFileManagerDlg.cpp:789
+#: Src/wptFileManagerDlg.cpp:790
 msgid "Operation Status: Error"
 msgstr "Prozess-Status: Fehler"
 
-#: Src/wptFileManagerDlg.cpp:790
+#: Src/wptFileManagerDlg.cpp:791
 msgid "Operation Status: Done."
 msgstr "Prozess-Status: Fertig"
 
-#: Src/wptFileManagerDlg.cpp:833
+#: Src/wptFileManagerDlg.cpp:834
 #, c-format
 msgid ""
 "Total Capacity: %12sk\n"
@@ -1607,11 +1619,11 @@
 #: Src/wptGPGPrefsDlg.cpp:189 Src/wptGPGPrefsDlg.cpp:195
 #: Src/wptGPGPrefsDlg.cpp:200 Src/wptGPGPrefsDlg.cpp:205
 #: Src/wptGPGPrefsDlg.cpp:210 Src/wptGPGPrefsDlg.cpp:224
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyManagerDlg.cpp:859
-#: Src/wptMainProc.cpp:432 Src/wptPreferencesDlg.cpp:209
+#: Src/wptKeyEditDlgs.cpp:1621 Src/wptKeyManagerDlg.cpp:923
+#: Src/wptMainProc.cpp:430 Src/wptPreferencesDlg.cpp:209
 #: Src/wptPreferencesDlg.cpp:258 Src/wptPreferencesDlg.cpp:269
 #: Src/wptPreferencesDlg.cpp:281 Src/wptPreferencesDlg.cpp:294
-#: Src/wptPreferencesDlg.cpp:340 Src/wptRegistry.cpp:608
+#: Src/wptPreferencesDlg.cpp:340 Src/wptRegistry.cpp:609
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -1746,8 +1758,8 @@
 "Aktuelle Daten gehen verloren\n"
 "Sind Sie sicher?"
 
-#: Src/wptGPGPrefsDlg.cpp:127 Src/wptKeyManagerDlg.cpp:1443
-#: Src/wptMainProc.cpp:587
+#: Src/wptGPGPrefsDlg.cpp:127 Src/wptKeyManagerDlg.cpp:1515
+#: Src/wptMainProc.cpp:581
 msgid "GnuPG Preferences"
 msgstr "GnuPG-Einstellungen"
 
@@ -1867,52 +1879,52 @@
 msgid "Unknown Hotkey"
 msgstr "Unbekanntes Tastenkürzel"
 
-#: Src/wptImagelist.cpp:50 Src/wptKeyManager.cpp:166 Src/wptKeyManager.cpp:171
-#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:301
-#: Src/wptKeyManager.cpp:308 Src/wptKeyManager.cpp:337
-#: Src/wptKeyManager.cpp:342 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:351 Src/wptKeyManager.cpp:372
-#: Src/wptKeyManager.cpp:389 Src/wptKeyManager.cpp:393
-#: Src/wptKeyManager.cpp:399 Src/wptKeyManager.cpp:417
-#: Src/wptKeyManager.cpp:439 Src/wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:447 Src/wptKeyManager.cpp:452
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:463
-#: Src/wptKeyManager.cpp:549 Src/wptKeyManager.cpp:557
-#: Src/wptKeyManager.cpp:612 Src/wptKeyManager.cpp:639
-#: Src/wptKeyManager.cpp:649 Src/wptKeyManager.cpp:660
-#: Src/wptKeyManager.cpp:686 Src/wptKeyManager.cpp:710
-#: Src/wptKeyManager.cpp:717 Src/wptKeyManager.cpp:741
-#: Src/wptKeyManager.cpp:746 Src/wptKeyManager.cpp:772
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:815
-#: Src/wptKeyManager.cpp:919 Src/wptKeyManager.cpp:949
-#: Src/wptKeyManagerDlg.cpp:947 Src/wptKeyManagerDlg.cpp:968
-#: Src/wptKeyManagerDlg.cpp:1222 Src/wptKeyManagerDlg.cpp:1250
-#: Src/wptKeyManagerDlg.cpp:1268 Src/wptKeyManagerDlg.cpp:1275
-#: Src/wptKeyManagerDlg.cpp:1285 Src/wptKeyManagerDlg.cpp:1301
-#: Src/wptKeyManagerDlg.cpp:1307 Src/wptKeyManagerDlg.cpp:1320
-#: Src/wptKeyManagerDlg.cpp:1336 Src/wptKeyManagerDlg.cpp:1368
-#: Src/wptKeyManagerDlg.cpp:1407 Src/wptKeyManagerDlg.cpp:1468
-#: Src/wptKeyManagerDlg.cpp:1486 Src/wptKeyManagerDlg.cpp:1491
-#: Src/wptKeyManagerDlg.cpp:1496 Src/wptKeyManagerDlg.cpp:1571
-#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeysigDlg.cpp:88
+#: Src/wptImagelist.cpp:50 Src/wptKeyManager.cpp:172 Src/wptKeyManager.cpp:177
+#: Src/wptKeyManager.cpp:228 Src/wptKeyManager.cpp:307
+#: Src/wptKeyManager.cpp:314 Src/wptKeyManager.cpp:343
+#: Src/wptKeyManager.cpp:348 Src/wptKeyManager.cpp:355
+#: Src/wptKeyManager.cpp:357 Src/wptKeyManager.cpp:379
+#: Src/wptKeyManager.cpp:396 Src/wptKeyManager.cpp:400
+#: Src/wptKeyManager.cpp:406 Src/wptKeyManager.cpp:424
+#: Src/wptKeyManager.cpp:446 Src/wptKeyManager.cpp:451
+#: Src/wptKeyManager.cpp:454 Src/wptKeyManager.cpp:459
+#: Src/wptKeyManager.cpp:465 Src/wptKeyManager.cpp:470
+#: Src/wptKeyManager.cpp:556 Src/wptKeyManager.cpp:564
+#: Src/wptKeyManager.cpp:619 Src/wptKeyManager.cpp:646
+#: Src/wptKeyManager.cpp:656 Src/wptKeyManager.cpp:667
+#: Src/wptKeyManager.cpp:693 Src/wptKeyManager.cpp:717
+#: Src/wptKeyManager.cpp:724 Src/wptKeyManager.cpp:749
+#: Src/wptKeyManager.cpp:754 Src/wptKeyManager.cpp:781
+#: Src/wptKeyManager.cpp:819 Src/wptKeyManager.cpp:825
+#: Src/wptKeyManager.cpp:887 Src/wptKeyManager.cpp:917
+#: Src/wptKeyManagerDlg.cpp:1016 Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1292 Src/wptKeyManagerDlg.cpp:1320
+#: Src/wptKeyManagerDlg.cpp:1338 Src/wptKeyManagerDlg.cpp:1346
+#: Src/wptKeyManagerDlg.cpp:1356 Src/wptKeyManagerDlg.cpp:1372
+#: Src/wptKeyManagerDlg.cpp:1378 Src/wptKeyManagerDlg.cpp:1391
+#: Src/wptKeyManagerDlg.cpp:1408 Src/wptKeyManagerDlg.cpp:1440
+#: Src/wptKeyManagerDlg.cpp:1479 Src/wptKeyManagerDlg.cpp:1542
+#: Src/wptKeyManagerDlg.cpp:1560 Src/wptKeyManagerDlg.cpp:1565
+#: Src/wptKeyManagerDlg.cpp:1570 Src/wptKeyManagerDlg.cpp:1651
+#: Src/wptKeyManagerDlg.cpp:1827 Src/wptKeysigDlg.cpp:88
 #: Src/wptKeysigDlg.cpp:99 Src/wptKeysigDlg.cpp:321 Src/wptKeysigDlg.cpp:327
-#: Src/wptKeysigDlg.cpp:370 Src/wptKeysigDlg.cpp:432 Src/wptMainProc.cpp:400
-#: Src/wptMainProc.cpp:558
+#: Src/wptKeysigDlg.cpp:371 Src/wptKeysigDlg.cpp:433 Src/wptMainProc.cpp:398
+#: Src/wptMainProc.cpp:552
 msgid "Key Manager"
 msgstr "Schlüsselverwaltung"
 
 #: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:205
-#: Src/wptKeyEditDlgs.cpp:1025 Src/wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1358 Src/wptKeyEditDlgs.cpp:1378
-#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1444
-#: Src/wptKeylist.cpp:374 Src/wptKeyPropsDlg.cpp:146 Src/wptKeysigDlg.cpp:136
+#: Src/wptKeyEditDlgs.cpp:1028 Src/wptKeyEditDlgs.cpp:1089
+#: Src/wptKeyEditDlgs.cpp:1361 Src/wptKeyEditDlgs.cpp:1381
+#: Src/wptKeyEditDlgs.cpp:1418 Src/wptKeyEditDlgs.cpp:1447
+#: Src/wptKeylist.cpp:379 Src/wptKeyPropsDlg.cpp:157 Src/wptKeysigDlg.cpp:136
 #: Src/wptKeysigDlg.cpp:201
 msgid "Revoked"
 msgstr "Widerrufen"
 
 #: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:206
-#: Src/wptKeyEditDlgs.cpp:1023 Src/wptKeyEditDlgs.cpp:1279
-#: Src/wptKeylist.cpp:376 Src/wptKeyPropsDlg.cpp:143 Src/wptKeysigDlg.cpp:135
+#: Src/wptKeyEditDlgs.cpp:1026 Src/wptKeyEditDlgs.cpp:1282
+#: Src/wptKeylist.cpp:381 Src/wptKeyPropsDlg.cpp:154 Src/wptKeysigDlg.cpp:135
 #: Src/wptKeysigDlg.cpp:202
 msgid "Expired"
 msgstr "Abgelaufen"
@@ -1925,35 +1937,39 @@
 msgid "public key"
 msgstr "öffentlicher Schlüssel"
 
-#: Src/wptImportList.cpp:303 Src/wptKeyEditDlgs.cpp:1103
+#: Src/wptImportList.cpp:303 Src/wptKeyEditDlgs.cpp:1106
 msgid "Invalid user ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:536 Src/wptKeylist.cpp:545
-#: Src/wptKeyManagerDlg.cpp:845 Src/wptKeyserverSearchDlg.cpp:48
-#: Src/wptSigList.cpp:51 Src/wptVerifyList.cpp:91 Src/wptVerifyList.cpp:100
+#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:541 Src/wptKeylist.cpp:550
+#: Src/wptKeyManagerDlg.cpp:863 Src/wptKeyManagerDlg.cpp:909
+#: Src/wptKeyserverSearchDlg.cpp:48 Src/wptSigList.cpp:51
+#: Src/wptVerifyList.cpp:101 Src/wptVerifyList.cpp:110
 msgid "User ID"
 msgstr "Benutzerkennung"
 
-#: Src/wptImportList.cpp:353 Src/wptKeylist.cpp:538 Src/wptKeylist.cpp:548
-#: Src/wptKeyserverSearchDlg.cpp:45
+#: Src/wptImportList.cpp:353 Src/wptKeylist.cpp:543 Src/wptKeylist.cpp:553
+#: Src/wptKeyManagerDlg.cpp:866 Src/wptKeyserverSearchDlg.cpp:45
 msgid "Size"
 msgstr "Größe"
 
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:949 Src/wptKeylist.cpp:537
-#: Src/wptKeylist.cpp:546 Src/wptKeyRevokersDlg.cpp:51
+#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:952 Src/wptKeylist.cpp:542
+#: Src/wptKeylist.cpp:551 Src/wptKeyManagerDlg.cpp:864
+#: Src/wptKeyManagerDlg.cpp:932 Src/wptKeyRevokersDlg.cpp:58
 #: Src/wptKeyserverSearchDlg.cpp:46 Src/wptSigList.cpp:55
-#: Src/wptVerifyList.cpp:99
+#: Src/wptVerifyList.cpp:109
 msgid "Key ID"
 msgstr "Schlüssel-ID"
 
-#: Src/wptImportList.cpp:355 Src/wptKeyEditDlgs.cpp:950
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeylist.cpp:552
+#: Src/wptImportList.cpp:355 Src/wptKeyEditDlgs.cpp:953
+#: Src/wptKeyEditDlgs.cpp:1058 Src/wptKeylist.cpp:557
+#: Src/wptKeyManagerDlg.cpp:870 Src/wptKeyManagerDlg.cpp:935
 #: Src/wptKeyserverSearchDlg.cpp:47 Src/wptSigList.cpp:54
 msgid "Creation"
 msgstr "Erstellung"
 
-#: Src/wptImportList.cpp:356 Src/wptKeylist.cpp:547
+#: Src/wptImportList.cpp:356 Src/wptKeylist.cpp:552
+#: Src/wptKeyManagerDlg.cpp:865 Src/wptKeyManagerDlg.cpp:934
 msgid "Type"
 msgstr "Typ"
 
@@ -1987,12 +2003,12 @@
 msgid "Ultimate"
 msgstr "Absolut"
 
-#: Src/wptKeyEditDlgs.cpp:194 Src/wptKeyEditDlgs.cpp:1020
-#: Src/wptKeylist.cpp:234 Src/wptKeylist.cpp:336 Src/wptKeylist.cpp:894
+#: Src/wptKeyEditDlgs.cpp:194 Src/wptKeyEditDlgs.cpp:1023
+#: Src/wptKeylist.cpp:227 Src/wptKeylist.cpp:341 Src/wptKeylist.cpp:943
 msgid "Never"
 msgstr "Niemals"
 
-#: Src/wptKeyEditDlgs.cpp:207 Src/wptKeyEditDlgs.cpp:1027
+#: Src/wptKeyEditDlgs.cpp:207 Src/wptKeyEditDlgs.cpp:1030
 msgid "OK"
 msgstr "OK"
 
@@ -2048,7 +2064,7 @@
 
 #: Src/wptKeyEditDlgs.cpp:309 Src/wptKeyEditDlgs.cpp:319
 #: Src/wptKeyEditDlgs.cpp:325 Src/wptKeyEditDlgs.cpp:331
-#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:840
+#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:842
 msgid "Add Photo"
 msgstr "Foto hinzufügen"
 
@@ -2057,7 +2073,7 @@
 msgid "'%s' is not a valid JPEG file."
 msgstr "'%s' is keine gültige JPEG Datei."
 
-#: Src/wptKeyEditDlgs.cpp:319 Src/wptKeyRevokeDlg.cpp:135
+#: Src/wptKeyEditDlgs.cpp:319 Src/wptKeyRevokeDlg.cpp:142
 msgid "Please enter a file name."
 msgstr "Bitte Dateinamen eingeben."
 
@@ -2077,13 +2093,13 @@
 msgid "Photo successfully added."
 msgstr "Foto erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:349 Src/wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:509 Src/wptKeyEditDlgs.cpp:673
-#: Src/wptKeyEditDlgs.cpp:1380 Src/wptKeyEditDlgs.cpp:1446
-#: Src/wptKeyEditDlgs.cpp:1526 Src/wptKeyEditDlgs.cpp:1700
+#: Src/wptKeyEditDlgs.cpp:349 Src/wptKeyEditDlgs.cpp:428
+#: Src/wptKeyEditDlgs.cpp:510 Src/wptKeyEditDlgs.cpp:675
+#: Src/wptKeyEditDlgs.cpp:1383 Src/wptKeyEditDlgs.cpp:1449
+#: Src/wptKeyEditDlgs.cpp:1529 Src/wptKeyEditDlgs.cpp:1703
 #: Src/wptKeygenDlg.cpp:547 Src/wptKeygenDlg.cpp:663
-#: Src/wptKeyPropsDlg.cpp:338 Src/wptKeyRevokeDlg.cpp:164
-#: Src/wptOwnertrustDlg.cpp:124 Src/wptOwnertrustDlg.cpp:136
+#: Src/wptKeyPropsDlg.cpp:349 Src/wptOwnertrustDlg.cpp:124
+#: Src/wptOwnertrustDlg.cpp:136
 msgid "GnuPG Status"
 msgstr "GnuPG-Status"
 
@@ -2100,18 +2116,18 @@
 
 #: Src/wptKeyEditDlgs.cpp:389 Src/wptKeyEditDlgs.cpp:405
 #: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:422
-#: Src/wptKeyEditDlgs.cpp:853
+#: Src/wptKeyEditDlgs.cpp:855
 msgid "Add Revoker"
 msgstr "\"Revoker\" hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:1410
-#: Src/wptKeyEditDlgs.cpp:1463 Src/wptKeyEditDlgs.cpp:1505
-#: Src/wptKeyEditDlgs.cpp:1644 Src/wptKeyEditDlgs.cpp:1673
+#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:1413
+#: Src/wptKeyEditDlgs.cpp:1466 Src/wptKeyEditDlgs.cpp:1508
+#: Src/wptKeyEditDlgs.cpp:1647 Src/wptKeyEditDlgs.cpp:1676
 msgid "Please select a user ID."
 msgstr "Bitte eine Benutzerkennung wählen."
 
 #: Src/wptKeyEditDlgs.cpp:411 Src/wptKeygenDlg.cpp:475
-#: Src/wptKeyRevokeDlg.cpp:143
+#: Src/wptKeyRevokeDlg.cpp:150
 msgid "Please enter the passphrase."
 msgstr "Bitte das Passwort eingeben."
 
@@ -2119,96 +2135,96 @@
 msgid "Revoker successfully addded."
 msgstr "Widerruf erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:458
+#: Src/wptKeyEditDlgs.cpp:459
 msgid "Add new User ID"
 msgstr "Neue Benutzerkennung hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:460
+#: Src/wptKeyEditDlgs.cpp:461
 msgid "&Email"
 msgstr "&E-Mail"
 
-#: Src/wptKeyEditDlgs.cpp:461
+#: Src/wptKeyEditDlgs.cpp:462
 msgid "&Comment"
 msgstr "&Kommentar"
 
-#: Src/wptKeyEditDlgs.cpp:477
+#: Src/wptKeyEditDlgs.cpp:478
 msgid "Please enter a name (min. 5 chars.)"
 msgstr "Bitte Namen eingeben (mindestens 5 Zeichen)"
 
-#: Src/wptKeyEditDlgs.cpp:477 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:486 Src/wptKeyEditDlgs.cpp:490
-#: Src/wptKeyEditDlgs.cpp:507
+#: Src/wptKeyEditDlgs.cpp:478 Src/wptKeyEditDlgs.cpp:482
+#: Src/wptKeyEditDlgs.cpp:487 Src/wptKeyEditDlgs.cpp:491
+#: Src/wptKeyEditDlgs.cpp:508
 msgid "UserID"
 msgstr "Benutzerkennung"
 
-#: Src/wptKeyEditDlgs.cpp:481
+#: Src/wptKeyEditDlgs.cpp:482
 msgid ""
 "Please enter the email address in the email field and not in the name field"
 msgstr ""
 "Bitte E-Mail-Adresse in das E-Mail-Feld und nicht in das Namensfeld eingeben"
 
-#: Src/wptKeyEditDlgs.cpp:486
+#: Src/wptKeyEditDlgs.cpp:487
 msgid "Please enter an email address."
 msgstr "Bitte eine E-Mail-Adresse eingeben."
 
-#: Src/wptKeyEditDlgs.cpp:490
+#: Src/wptKeyEditDlgs.cpp:491
 msgid "Invalid email address."
 msgstr "Ungültige E-Mail-Adresse"
 
-#: Src/wptKeyEditDlgs.cpp:509
+#: Src/wptKeyEditDlgs.cpp:510
 msgid "user ID successfully added."
 msgstr "Benutzerkennung erfolgreich hinzugefügt"
 
-#: Src/wptKeyEditDlgs.cpp:592 Src/wptKeyEditDlgs.cpp:789
+#: Src/wptKeyEditDlgs.cpp:594 Src/wptKeyEditDlgs.cpp:791
 msgid "Add new Subkey"
 msgstr "Neuen Unterschlüssel hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:593
+#: Src/wptKeyEditDlgs.cpp:595
 msgid "Key type"
 msgstr "Schlüssel Typ"
 
-#: Src/wptKeyEditDlgs.cpp:594
+#: Src/wptKeyEditDlgs.cpp:596
 msgid "Size in bits"
 msgstr "Größe in Bits"
 
-#: Src/wptKeyEditDlgs.cpp:595
+#: Src/wptKeyEditDlgs.cpp:597
 msgid "Key expiration"
 msgstr "Key Ablaufdatum"
 
-#: Src/wptKeyEditDlgs.cpp:638
+#: Src/wptKeyEditDlgs.cpp:640
 msgid "Please select one entry."
 msgstr "Bitte einen Eintrag wählen."
 
-#: Src/wptKeyEditDlgs.cpp:638 Src/wptKeyEditDlgs.cpp:643
-#: Src/wptKeyEditDlgs.cpp:671 Src/wptKeyEditDlgs.cpp:773
+#: Src/wptKeyEditDlgs.cpp:640 Src/wptKeyEditDlgs.cpp:645
+#: Src/wptKeyEditDlgs.cpp:673 Src/wptKeyEditDlgs.cpp:775
 msgid "Add Subkey"
 msgstr "Unterschlüssel hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:643
+#: Src/wptKeyEditDlgs.cpp:645
 msgid "DSS uses a fixed keysize of 1024. Size changed."
 msgstr "DSS benötigt feste Schlüssellänge von 1024. Größe geändert."
 
-#: Src/wptKeyEditDlgs.cpp:673
+#: Src/wptKeyEditDlgs.cpp:675
 msgid "Subkey successfully added."
 msgstr "Unterschlüssel erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:773
-#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:853
-#: Src/wptKeyEditDlgs.cpp:893 Src/wptKeyEditDlgs.cpp:1268
-#: Src/wptKeyEditDlgs.cpp:1341 Src/wptKeyEditDlgs.cpp:1400
-#: Src/wptKeyManagerDlg.cpp:1274
+#: Src/wptKeyEditDlgs.cpp:703 Src/wptKeyEditDlgs.cpp:775
+#: Src/wptKeyEditDlgs.cpp:842 Src/wptKeyEditDlgs.cpp:855
+#: Src/wptKeyEditDlgs.cpp:896 Src/wptKeyEditDlgs.cpp:1271
+#: Src/wptKeyEditDlgs.cpp:1344 Src/wptKeyEditDlgs.cpp:1403
+#: Src/wptKeyManagerDlg.cpp:1345
 msgid "There is no secret key available!"
 msgstr "Kein geheimer Schlüssel vorhanden!"
 
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:717
+#: Src/wptKeyEditDlgs.cpp:703 Src/wptKeyEditDlgs.cpp:719
 msgid "Add user ID"
 msgstr "Benutzerkennung hinzufügen"
 
-#: Src/wptKeyEditDlgs.cpp:825
+#: Src/wptKeyEditDlgs.cpp:827
 msgid "Preferred keyserver successfully set."
 msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
 
-#: Src/wptKeyEditDlgs.cpp:898
+#: Src/wptKeyEditDlgs.cpp:901
 msgid ""
 "Cannot change passphrase because the key\n"
 "is protected with the IDEA encryption algorithm."
@@ -2216,15 +2232,15 @@
 "Kann das Passwort das Schlüssels nicht ändern, da der \n"
 "Schlüssel mit dem IDEA Verschlüsselungs-Algorithmus gesichert ist."
 
-#: Src/wptKeyEditDlgs.cpp:905
+#: Src/wptKeyEditDlgs.cpp:908
 msgid "Current (old) Passphrase"
 msgstr "Aktuelles (altes) Passwort"
 
-#: Src/wptKeyEditDlgs.cpp:909
+#: Src/wptKeyEditDlgs.cpp:912
 msgid "New Passphrase"
 msgstr "Neues Passwort"
 
-#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeygenDlg.cpp:503
+#: Src/wptKeyEditDlgs.cpp:919 Src/wptKeygenDlg.cpp:503
 #: Src/wptPassphraseDlg.cpp:175
 msgid ""
 "The passphrase contains 8-bit characters.\n"
@@ -2233,43 +2249,44 @@
 "Das Passwort enthält 8-bit Zeichen.\n"
 "Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
 
-#: Src/wptKeyEditDlgs.cpp:931
+#: Src/wptKeyEditDlgs.cpp:934
 msgid "Change Passwd"
 msgstr "Passwort ändern"
 
-#: Src/wptKeyEditDlgs.cpp:933
+#: Src/wptKeyEditDlgs.cpp:936
 msgid "Passphrase successfully changed."
 msgstr "Passwort erfolgreich geändert."
 
-#: Src/wptKeyEditDlgs.cpp:948
+#: Src/wptKeyEditDlgs.cpp:951
 msgid "Description"
 msgstr "Beschreibung"
 
-#: Src/wptKeyEditDlgs.cpp:951
+#: Src/wptKeyEditDlgs.cpp:954
 msgid "Expires"
 msgstr "Verfällt"
 
-#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditDlgs.cpp:1061
+#: Src/wptKeyEditDlgs.cpp:968 Src/wptKeyEditDlgs.cpp:1064
 msgid "Could not find key."
 msgstr "Konnte Schlüssel nicht finden"
 
-#: Src/wptKeyEditDlgs.cpp:970
+#: Src/wptKeyEditDlgs.cpp:973
 msgid "No subkey(s) found."
 msgstr "Kein(e) Unterschlüssel gefunden."
 
-#: Src/wptKeyEditDlgs.cpp:1052 Src/wptKeylist.cpp:540 Src/wptKeylist.cpp:550
+#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeylist.cpp:545 Src/wptKeylist.cpp:555
+#: Src/wptKeyManagerDlg.cpp:868
 msgid "Validity"
 msgstr "Gültigkeit"
 
-#: Src/wptKeyEditDlgs.cpp:1054
+#: Src/wptKeyEditDlgs.cpp:1057
 msgid "Email"
 msgstr "Email"
 
-#: Src/wptKeyEditDlgs.cpp:1067
+#: Src/wptKeyEditDlgs.cpp:1070
 msgid "No user ID(s) found."
 msgstr "Keine Benutzerkennung(en) gefunden."
 
-#: Src/wptKeyEditDlgs.cpp:1182
+#: Src/wptKeyEditDlgs.cpp:1185
 msgid ""
 "ADDUID   \t\tadd a user ID\r\n"
 "ADDPHOTO  \t\tadd a photo ID\r\n"
@@ -2304,19 +2321,19 @@
 "ENABLE    \t\tSchlüssel aktivieren\r\n"
 "SHOWPHOTO \t\tFoto ID anzeigen\r\n"
 
-#: Src/wptKeyEditDlgs.cpp:1203
+#: Src/wptKeyEditDlgs.cpp:1206
 msgid "Key Edit Help"
 msgstr "Hilfe zum Schlüssel bearbeiten"
 
-#: Src/wptKeyEditDlgs.cpp:1219
+#: Src/wptKeyEditDlgs.cpp:1222
 msgid "Primary key can not be deleted!"
 msgstr "Primärer Schlüssel kann nicht gelöscht werden!"
 
-#: Src/wptKeyEditDlgs.cpp:1227
+#: Src/wptKeyEditDlgs.cpp:1230
 msgid "Primary subkey can not be deleted!"
 msgstr "Primärer Unterschlüssel kann nicht gelöscht werden!"
 
-#: Src/wptKeyEditDlgs.cpp:1233
+#: Src/wptKeyEditDlgs.cpp:1236
 #, c-format
 msgid ""
 "\"Subkey %s.\"\n"
@@ -2333,34 +2350,34 @@
 "\n"
 "Möchten Sie diesen Unterschlüssel wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1245
+#: Src/wptKeyEditDlgs.cpp:1248
 msgid "Delete Subkey"
 msgstr "Unterschlüssel löschen"
 
-#: Src/wptKeyEditDlgs.cpp:1249
+#: Src/wptKeyEditDlgs.cpp:1252
 msgid "Subkey successfully deleted."
 msgstr "Unterschlüssel erfolgreich gelöscht."
 
-#: Src/wptKeyEditDlgs.cpp:1280
+#: Src/wptKeyEditDlgs.cpp:1283
 msgid ""
 "Key already expired.\n"
 "\n"
 "Do you want to change the expiration date?"
 msgstr ""
 
-#: Src/wptKeyEditDlgs.cpp:1289 Src/wptKeyEditDlgs.cpp:1292
+#: Src/wptKeyEditDlgs.cpp:1292 Src/wptKeyEditDlgs.cpp:1295
 msgid "Key Expiration Date"
 msgstr "Ablaufdatum"
 
-#: Src/wptKeyEditDlgs.cpp:1313
+#: Src/wptKeyEditDlgs.cpp:1316
 msgid "Expire Subkey"
 msgstr "Untschlüssel Ablauf"
 
-#: Src/wptKeyEditDlgs.cpp:1319
+#: Src/wptKeyEditDlgs.cpp:1322
 msgid "Subkey expire date successfully set."
 msgstr "Unterschlüsselablaufdatum erfolgreich hinzugefügt."
 
-#: Src/wptKeyEditDlgs.cpp:1350
+#: Src/wptKeyEditDlgs.cpp:1353
 msgid ""
 "No subkeys were found, if you want to revoke the\n"
 "whole key, please use the Key Manager command directly.\n"
@@ -2372,31 +2389,31 @@
 "\n"
 "Diese Funktion ist nur für das Widerrufen einzelner Unterschlüssel gedacht."
 
-#: Src/wptKeyEditDlgs.cpp:1359
+#: Src/wptKeyEditDlgs.cpp:1362
 msgid "Key already revoked."
 msgstr "Der Schlüssel ist bereits widerrufen worden!"
 
-#: Src/wptKeyEditDlgs.cpp:1376
+#: Src/wptKeyEditDlgs.cpp:1379
 msgid "Revoke Subkey"
 msgstr "Unterschlüssel widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1380
+#: Src/wptKeyEditDlgs.cpp:1383
 msgid "Subkey successfully revoked."
 msgstr "Unterschlüssel erfolgreich widerrufen."
 
-#: Src/wptKeyEditDlgs.cpp:1400
+#: Src/wptKeyEditDlgs.cpp:1403
 msgid "Revoke user ID"
 msgstr "Benutzerkennung widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1405
+#: Src/wptKeyEditDlgs.cpp:1408
 msgid "Key has only one user ID."
 msgstr "Schlüssel hat nur eine Benutzerkennung."
 
-#: Src/wptKeyEditDlgs.cpp:1416
+#: Src/wptKeyEditDlgs.cpp:1419
 msgid "This user ID has been already revoked."
 msgstr "Diese Benutzerkennung wurde bereits widerrufen."
 
-#: Src/wptKeyEditDlgs.cpp:1421
+#: Src/wptKeyEditDlgs.cpp:1424
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2406,39 +2423,39 @@
 "Benutzerkennung %s.\r\n"
 "Diese Benutzerkennung wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1442
+#: Src/wptKeyEditDlgs.cpp:1445
 msgid "Revoke Signature"
 msgstr "Signatur widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1446
+#: Src/wptKeyEditDlgs.cpp:1449
 msgid "User ID successfully revoked"
 msgstr "Benutzerkennung erfolgreich widerrufen"
 
-#: Src/wptKeyEditDlgs.cpp:1523
+#: Src/wptKeyEditDlgs.cpp:1526
 msgid "Primary"
 msgstr "Primär"
 
-#: Src/wptKeyEditDlgs.cpp:1526
+#: Src/wptKeyEditDlgs.cpp:1529
 msgid "User ID successfully flagged"
 msgstr "Benutzerkennung erfolgreich gekennzeichnet"
 
-#: Src/wptKeyEditDlgs.cpp:1611
+#: Src/wptKeyEditDlgs.cpp:1614
 msgid "No preferences available."
 msgstr "Keine Präferenzen verfübar."
 
-#: Src/wptKeyEditDlgs.cpp:1617
+#: Src/wptKeyEditDlgs.cpp:1620
 msgid "MDC feature"
 msgstr "Unterstützt MDC"
 
-#: Src/wptKeyEditDlgs.cpp:1619 Src/wptKeyeditSetPrefDlg.cpp:116
+#: Src/wptKeyEditDlgs.cpp:1622 Src/wptKeyeditSetPrefDlg.cpp:116
 msgid "Key Preferences"
 msgstr "Schlüsseleinstellungen"
 
-#: Src/wptKeyEditDlgs.cpp:1669
+#: Src/wptKeyEditDlgs.cpp:1672
 msgid "Primary user ID can not be deleted!"
 msgstr "Primäre Benutzerkennung kann nicht gelöscht werden!"
 
-#: Src/wptKeyEditDlgs.cpp:1679
+#: Src/wptKeyEditDlgs.cpp:1682
 #, c-format
 msgid ""
 "user ID \"%s\".\n"
@@ -2448,36 +2465,36 @@
 "Benutzerkennung %s.\r\n"
 "Diese Benutzerkennung wirklich löschen?"
 
-#: Src/wptKeyEditDlgs.cpp:1696
+#: Src/wptKeyEditDlgs.cpp:1699
 msgid "Delete user ID"
 msgstr "Benutzerkennung löschen"
 
-#: Src/wptKeyEditDlgs.cpp:1700
+#: Src/wptKeyEditDlgs.cpp:1703
 msgid "User ID successfully deleted"
 msgstr "Benutzerkennung erfolgreich gelöscht"
 
-#: Src/wptKeyEditDlgs.cpp:1782
+#: Src/wptKeyEditDlgs.cpp:1785
 msgid "Could not set subkey window procedure."
 msgstr "Konnte \"subkey window procedure\" nicht setzen."
 
-#: Src/wptKeyEditDlgs.cpp:1792
+#: Src/wptKeyEditDlgs.cpp:1795
 msgid "Could not set user ID window procedure."
 msgstr "Konnte \"userID window procedure\" nicht setzen."
 
 # c:\oss\winpt-gpgme\src\wptKeyEditDlgs.cpp:1739
-#: Src/wptKeyEditDlgs.cpp:1800
+#: Src/wptKeyEditDlgs.cpp:1803
 msgid "Command>"
 msgstr "Kommando>"
 
-#: Src/wptKeyEditDlgs.cpp:1832
+#: Src/wptKeyEditDlgs.cpp:1835
 msgid "Please select a command."
 msgstr "Bitte einen Befehl auswählen."
 
-#: Src/wptKeyEditDlgs.cpp:1837
+#: Src/wptKeyEditDlgs.cpp:1840
 msgid "This command cannot be used with PGP 2 (v3) keys.\n"
 msgstr "Dieser Befehl kann mit PGP2 (v3) Schlüsseln nicht verwendet werden.\n"
 
-#: Src/wptKeyEditOwnertrustDlg.cpp:55 Src/wptKeyPropsDlg.cpp:328
+#: Src/wptKeyEditOwnertrustDlg.cpp:55 Src/wptKeyPropsDlg.cpp:339
 msgid "Change Ownertrust"
 msgstr "Besitzervertrauen ändern"
 
@@ -2516,8 +2533,8 @@
 msgstr "Bitte wählen Sie einen Eintrag."
 
 #: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:839
-#: Src/wptKeyManagerDlg.cpp:1528 Src/wptKeyPropsDlg.cpp:275
+#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:903
+#: Src/wptKeyManagerDlg.cpp:1604 Src/wptKeyPropsDlg.cpp:286
 #: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
 #: Src/wptOwnertrustDlg.cpp:133
 msgid "Ownertrust"
@@ -2541,7 +2558,7 @@
 #: Src/wptKeygenDlg.cpp:462 Src/wptKeygenDlg.cpp:476 Src/wptKeygenDlg.cpp:483
 #: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:497 Src/wptKeygenDlg.cpp:505
 #: Src/wptKeygenDlg.cpp:544 Src/wptKeygenDlg.cpp:637
-#: Src/wptKeyManagerDlg.cpp:1396 Src/wptPassphraseDlg.cpp:95
+#: Src/wptKeyManagerDlg.cpp:1468 Src/wptPassphraseDlg.cpp:95
 msgid "Key Generation"
 msgstr "Schlüsselerzeugung"
 
@@ -2620,7 +2637,7 @@
 msgid "&Real name"
 msgstr "&Ihr Name"
 
-#: Src/wptKeygenDlg.cpp:389 Src/wptKeyRevokeDlg.cpp:93
+#: Src/wptKeygenDlg.cpp:389 Src/wptKeyRevokeDlg.cpp:104
 msgid "&Passphrase"
 msgstr "&Passwort"
 
@@ -2729,7 +2746,7 @@
 
 #: Src/wptKeygenDlg.cpp:596 Src/wptKeygenDlg.cpp:618 Src/wptKeygenDlg.cpp:623
 #: Src/wptKeygenDlg.cpp:629 Src/wptKeygenDlg.cpp:634 Src/wptKeygenDlg.cpp:658
-#: Src/wptKeyManagerDlg.cpp:1422
+#: Src/wptKeyManagerDlg.cpp:1494
 msgid "Key Generation Wizard"
 msgstr "Schlüsselerzeugungs-Assistent"
 
@@ -2789,58 +2806,60 @@
 msgid "No keys updated."
 msgstr "Kein(e) Schlüssel aktualisiert."
 
-#: Src/wptKeylist.cpp:248
+#: Src/wptKeylist.cpp:241
 msgid "Key Pair"
 msgstr "Schlüsselpaar"
 
-#: Src/wptKeylist.cpp:250
+#: Src/wptKeylist.cpp:243
 msgid "Key Pair (Card)"
 msgstr "Schlüsselpaar (Karte)"
 
-#: Src/wptKeylist.cpp:251
+#: Src/wptKeylist.cpp:244
 msgid "Public Key"
 msgstr "Öffentlicher Schlüssel"
 
-#: Src/wptKeylist.cpp:334 Src/wptKeylist.cpp:895
+#: Src/wptKeylist.cpp:339 Src/wptKeylist.cpp:944
 msgid "None"
 msgstr "Keine"
 
-#: Src/wptKeylist.cpp:338
+#: Src/wptKeylist.cpp:343
 msgid "Marginal"
 msgstr "Marginal"
 
 # c:\oss\winpt-gpgme\src\wptKeylist.cpp:492
-#: Src/wptKeylist.cpp:341 Src/wptKeylist.cpp:500
+#: Src/wptKeylist.cpp:346 Src/wptKeylist.cpp:505
 msgid "Full"
 msgstr "Voll"
 
-#: Src/wptKeylist.cpp:378 Src/wptKeyPropsDlg.cpp:149
+#: Src/wptKeylist.cpp:383 Src/wptKeyPropsDlg.cpp:160
 msgid "Disabled"
 msgstr "Inaktiv"
 
-#: Src/wptKeylist.cpp:539 Src/wptKeylist.cpp:549
+#: Src/wptKeylist.cpp:544 Src/wptKeylist.cpp:554 Src/wptKeyManagerDlg.cpp:867
+#: Src/wptKeyManagerDlg.cpp:933
 msgid "Cipher"
 msgstr "Cipher"
 
-#: Src/wptKeylist.cpp:551 Src/wptVerifyList.cpp:90 Src/wptVerifyList.cpp:98
+#: Src/wptKeylist.cpp:556 Src/wptKeyManagerDlg.cpp:869
+#: Src/wptVerifyList.cpp:100 Src/wptVerifyList.cpp:108
 msgid "Trust"
 msgstr "Vertrauen"
 
-#: Src/wptKeylist.cpp:717 Src/wptPassphraseCB.cpp:110
-#: Src/wptVerifyList.cpp:181
+#: Src/wptKeylist.cpp:722 Src/wptPassphraseCB.cpp:110
+#: Src/wptVerifyList.cpp:191
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzerkennung"
 
-#: Src/wptKeylist.cpp:892 Src/wptKeyPropsDlg.cpp:66 Src/wptVerifyList.cpp:159
-#: Src/wptVerifyList.cpp:235
+#: Src/wptKeylist.cpp:941 Src/wptKeyPropsDlg.cpp:66 Src/wptVerifyList.cpp:169
+#: Src/wptVerifyList.cpp:245
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: Src/wptKeylist.cpp:893
+#: Src/wptKeylist.cpp:942
 msgid "Undefined"
 msgstr ""
 
-#: Src/wptKeylist.cpp:936
+#: Src/wptKeylist.cpp:985
 #, c-format
 msgid ""
 "It is NOT certain that the key belongs to the person\n"
@@ -2855,11 +2874,11 @@
 "\n"
 "\"%s\" benutzen?"
 
-#: Src/wptKeylist.cpp:944 Src/wptKeylist.cpp:1020
+#: Src/wptKeylist.cpp:993 Src/wptKeylist.cpp:1069
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: Src/wptKeylist.cpp:1019
+#: Src/wptKeylist.cpp:1068
 #, c-format
 msgid ""
 "KeyID %s.\n"
@@ -2868,11 +2887,11 @@
 "Schlüssel ID %s.\n"
 "Wollen Sie wirklich einen widerrufenen Schlüssel exportieren?"
 
-#: Src/wptKeylist.cpp:1121
+#: Src/wptKeylist.cpp:1170
 msgid "Secret Key List"
 msgstr "Liste der geheimen Schlüssel"
 
-#: Src/wptKeyManager.cpp:165
+#: Src/wptKeyManager.cpp:171
 msgid ""
 "This key has expired!\n"
 "Key check failed."
@@ -2880,7 +2899,7 @@
 "Dieser Schlüssel ist abgelaufen!\n"
 "Schlüsselüberprüfung fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:170
+#: Src/wptKeyManager.cpp:176
 msgid ""
 "This key has been revoked by its owner!\n"
 "Key check failed."
@@ -2888,34 +2907,34 @@
 "Dieser Schlüssel wurde vom Besitzer widerrufen!Schlüsselüberprüfung "
 "fehlgeschlagen."
 
-#: Src/wptKeyManager.cpp:220
+#: Src/wptKeyManager.cpp:226
 msgid "Key status changed."
 msgstr "Schlüsselstatus geändert"
 
-#: Src/wptKeyManager.cpp:341
+#: Src/wptKeyManager.cpp:347
 msgid "Only one secret key can be exported."
 msgstr "Nur der geheime Schlüssel kann exportiert werden."
 
-#: Src/wptKeyManager.cpp:352
+#: Src/wptKeyManager.cpp:358
 #, c-format
 msgid "Secret key successfully saved in '%s'."
 msgstr "Geheimer Schlüssel gespeichert in '%s'."
 
-#: Src/wptKeyManager.cpp:394
+#: Src/wptKeyManager.cpp:401
 #, c-format
 msgid "Key(s) successfully saved in '%s'."
 msgstr "Schlüssel erfolgreich in '%s' gespeichert."
 
-#: Src/wptKeyManager.cpp:400
+#: Src/wptKeyManager.cpp:407
 #, c-format
 msgid "Could not save data to '%s'."
 msgstr "Konnte Daten nicht in '%s' speichern."
 
-#: Src/wptKeyManager.cpp:451
+#: Src/wptKeyManager.cpp:458
 msgid "No valid OpenPGP keys found."
 msgstr "Keine gültigen OpenPGP-Schlüssel gefunden."
 
-#: Src/wptKeyManager.cpp:456
+#: Src/wptKeyManager.cpp:463
 msgid ""
 "The key you want to import is dash escacped.\n"
 "Do you want to extract the key?"
@@ -2923,38 +2942,38 @@
 "Der Import-Schlüssel ist beschädigt.\n"
 "Möchten Sie den Schlüssel extrahieren?"
 
-#: Src/wptKeyManager.cpp:462
+#: Src/wptKeyManager.cpp:469
 msgid "Cannot import dash escaped OpenPGP keys."
 msgstr "Kann keine beschädigten OpenPGP-Schlüssel importieren."
 
-#: Src/wptKeyManager.cpp:486 Src/wptKeyManager.cpp:497
-#: Src/wptKeyManager.cpp:511
+#: Src/wptKeyManager.cpp:493 Src/wptKeyManager.cpp:504
+#: Src/wptKeyManager.cpp:518
 msgid "Key Import HTTP"
 msgstr "Schlüssel Import HTTP"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:448
-#: Src/wptKeyManager.cpp:486
+#: Src/wptKeyManager.cpp:493
 #, c-format
 msgid "Invalid HTTP URL: %s"
 msgstr "Ungültige HTTP URL: %s"
 
-#: Src/wptKeyManager.cpp:537
+#: Src/wptKeyManager.cpp:544
 msgid "File Import"
 msgstr "Dateiimport"
 
-#: Src/wptKeyManager.cpp:548
+#: Src/wptKeyManager.cpp:555
 msgid "Could not read key-data from file."
 msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
 
-#: Src/wptKeyManager.cpp:617
+#: Src/wptKeyManager.cpp:624
 msgid "Do you really want to confirm each key?"
 msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
 
-#: Src/wptKeyManager.cpp:618
+#: Src/wptKeyManager.cpp:625
 msgid "Delete Confirmation"
 msgstr "Löschen Bestätigen"
 
-#: Src/wptKeyManager.cpp:640
+#: Src/wptKeyManager.cpp:647
 #, c-format
 msgid ""
 "Do you really want to delete this key?\n"
@@ -2966,7 +2985,7 @@
 "%s"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:650
+#: Src/wptKeyManager.cpp:657
 #, c-format
 msgid ""
 "Do you really want to delete this KEY PAIR?\n"
@@ -2983,7 +3002,7 @@
 "\n"
 "%s"
 
-#: Src/wptKeyManager.cpp:657
+#: Src/wptKeyManager.cpp:664
 msgid ""
 "The actual secret key is stored on a smartcard.\n"
 "Only the public key and the secret key \n"
@@ -2993,318 +3012,314 @@
 "Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
 "Schlüssel werden gelöscht.\n"
 
-#: Src/wptKeyManager.cpp:718
+#: Src/wptKeyManager.cpp:725
 #, c-format
 msgid "Do you really want to send '%s' to keyserver %s?"
 msgstr "Wollen Sie '%s' wirklich zum Schlüsselserver %s senden?"
 
-#: Src/wptKeyManager.cpp:740
+#: Src/wptKeyManager.cpp:748
 msgid "Please only select one key."
 msgstr "Bitte nur einen Schlüssel auswählen."
 
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:818
 msgid "Could not connect to keyserver, abort procedure."
 msgstr ""
 "Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
 
-#: Src/wptKeyManager.cpp:814
+#: Src/wptKeyManager.cpp:824
 msgid "Do you really want to refresh all keys in the keyring?"
 msgstr "Wirklich alle Schlüssel im Schlüsselbund neu laden?"
 
-#: Src/wptKeyManager.cpp:873
+#: Src/wptKeyManager.cpp:901
+msgid "Search"
+msgstr "Suchen"
+
+#: Src/wptKeyManager.cpp:901
+msgid "Search for:"
+msgstr "Suche nach:"
+
+# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
+#: Src/wptKeyManager.cpp:912
 #, c-format
+msgid "String pattern \"%s\" not found."
+msgstr "Zeichenkette \"%s\" nicht gefunden."
+
+#: Src/wptKeyManagerDlg.cpp:429 Src/wptKeyManagerDlg.cpp:953
+msgid "Paste Key from Clipboard"
+msgstr "Schlüssel aus Ablage einfügen"
+
+#: Src/wptKeyManagerDlg.cpp:457
+#, c-format
 msgid "Default Key: %s"
 msgstr "Standardschlüssel: %s"
 
-#: Src/wptKeyManager.cpp:875
+#: Src/wptKeyManagerDlg.cpp:459
 #, c-format
 msgid "Default Key: 0x%s"
 msgstr "Standardschlüssel: 0x%s"
 
-#: Src/wptKeyManager.cpp:895
+#: Src/wptKeyManagerDlg.cpp:479
 #, c-format
 msgid "%d secret keys"
 msgstr "%d geheime Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManager.cpp:896
+#: Src/wptKeyManagerDlg.cpp:480
 #, c-format
 msgid "%d keys"
 msgstr "%d Schlüssel"
 
-#: Src/wptKeyManager.cpp:933
-msgid "Search"
-msgstr "Suchen"
-
-#: Src/wptKeyManager.cpp:933
-msgid "Search for:"
-msgstr "Suche nach:"
-
-# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:944
-#, c-format
-msgid "String pattern \"%s\" not found."
-msgstr "Zeichenkette \"%s\" nicht gefunden."
-
-#: Src/wptKeyManagerDlg.cpp:428 Src/wptKeyManagerDlg.cpp:884
-msgid "Paste Key from Clipboard"
-msgstr "Schlüssel aus Ablage einfügen"
-
-#: Src/wptKeyManagerDlg.cpp:834
+#: Src/wptKeyManagerDlg.cpp:898
 msgid "Key"
 msgstr "Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:835 Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:899 Src/wptKeyManagerDlg.cpp:1050
 msgid "Groups"
 msgstr "Gruppen"
 
 # c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:838
+#: Src/wptKeyManagerDlg.cpp:902
 msgid "Send Mail..."
-msgstr "Sende eMail..."
+msgstr "eMail versenden..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:840
+#: Src/wptKeyManagerDlg.cpp:904
 msgid "&Copy\tCtrl+C"
 msgstr "&Kopieren\tCtrl+C"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:841
+#: Src/wptKeyManagerDlg.cpp:905
 msgid "&Paste\tCtrl+V"
 msgstr "&Einfügen\tCtrl+V"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:842
+#: Src/wptKeyManagerDlg.cpp:906
 msgid "Search...\tCtrl+F"
 msgstr "Suchen...\tCtrl+F"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:843
+#: Src/wptKeyManagerDlg.cpp:907
 msgid "Select All\tCtrl+A"
 msgstr "Alles markieren\tCtrl+A"
 
-#: Src/wptKeyManagerDlg.cpp:844
+#: Src/wptKeyManagerDlg.cpp:908
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: Src/wptKeyManagerDlg.cpp:846
+#: Src/wptKeyManagerDlg.cpp:910
 msgid "&Expert"
 msgstr "&Experte"
 
-#: Src/wptKeyManagerDlg.cpp:847
+#: Src/wptKeyManagerDlg.cpp:911
 msgid "&Normal"
 msgstr "&Normal"
 
-#: Src/wptKeyManagerDlg.cpp:850 Src/wptKeyManagerDlg.cpp:851
-#: Src/wptKeyManagerDlg.cpp:890
+#: Src/wptKeyManagerDlg.cpp:914 Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyManagerDlg.cpp:959
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: Src/wptKeyManagerDlg.cpp:852 Src/wptKeyManagerDlg.cpp:891
-msgid "&Revoke"
-msgstr "Wider&rufen"
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyManagerDlg.cpp:960
+msgid "&Revoke Cert"
+msgstr "Widerruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:853 Src/wptKeyManagerDlg.cpp:887
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:956
 msgid "&List Signatures"
 msgstr "Signaturen anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:854 Src/wptKeyManagerDlg.cpp:1315
+#: Src/wptKeyManagerDlg.cpp:918 Src/wptKeyManagerDlg.cpp:1386
 #: Src/wptKeyTrustPathDlg.cpp:130
 msgid "List Trust Path"
 msgstr "Zeige Vertrauenspfad"
 
-#: Src/wptKeyManagerDlg.cpp:855
+#: Src/wptKeyManagerDlg.cpp:919
 msgid "&Export..."
 msgstr "&Exportieren..."
 
-#: Src/wptKeyManagerDlg.cpp:856
+#: Src/wptKeyManagerDlg.cpp:920
 msgid "&Import..."
 msgstr "&Importieren..."
 
-#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:888
+#: Src/wptKeyManagerDlg.cpp:921 Src/wptKeyManagerDlg.cpp:957
 #: Src/wptKeysigDlg.cpp:356
 msgid "&Properties"
 msgstr "&Eigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:858
-msgid "Options"
-msgstr "Optionen"
-
-#: Src/wptKeyManagerDlg.cpp:861
+#: Src/wptKeyManagerDlg.cpp:925
 msgid "E&xport Secret Key"
 msgstr "E&xportiere geheimen Schlüssel"
 
-#: Src/wptKeyManagerDlg.cpp:862
+#: Src/wptKeyManagerDlg.cpp:926
 msgid "Re&load Key Cache"
 msgstr "Erneuere Sch&lüsselcache"
 
-#: Src/wptKeyManagerDlg.cpp:863
+#: Src/wptKeyManagerDlg.cpp:927
 msgid "R&everify Signatures"
 msgstr "Signaturen erneut prüfen"
 
-#: Src/wptKeyManagerDlg.cpp:864
+#: Src/wptKeyManagerDlg.cpp:928
 msgid "Refresh &Keys (Keyserver)"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:865 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:929 Src/wptTextInputDlg.cpp:49
 msgid "Info"
 msgstr "Über"
 
-#: Src/wptKeyManagerDlg.cpp:879
+#: Src/wptKeyManagerDlg.cpp:948
 msgid "Copy User ID to Clipboard"
 msgstr "Kopiere Benutzerkennung in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:880
+#: Src/wptKeyManagerDlg.cpp:949
 msgid "Copy Key ID to Clipboard"
 msgstr "Kopiere Schlüssel ID in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:881
+#: Src/wptKeyManagerDlg.cpp:950
 msgid "Copy Fingerprint to Clipboard"
 msgstr "Kopiere Fingerprint in Ablage"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:882
+#: Src/wptKeyManagerDlg.cpp:951
 msgid "Copy Key Info to Clipboard"
 msgstr "Kopiere Schlüssel Info in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:883
+#: Src/wptKeyManagerDlg.cpp:952
 msgid "Copy Key to Clipboard"
 msgstr "Kopiere Schlüssel in Ablage"
 
-#: Src/wptKeyManagerDlg.cpp:885
+#: Src/wptKeyManagerDlg.cpp:954
 msgid "Refresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:886
+#: Src/wptKeyManagerDlg.cpp:955
 msgid "Set Implicit &Trust"
 msgstr "Setze impliziertes Vertrauen"
 
-#: Src/wptKeyManagerDlg.cpp:893
+#: Src/wptKeyManagerDlg.cpp:962
 msgid "&Enable"
 msgstr "&Aktivieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:894
+#: Src/wptKeyManagerDlg.cpp:963
 msgid "&Disable"
 msgstr "&Deaktivieren"
 
-#: Src/wptKeyManagerDlg.cpp:895
+#: Src/wptKeyManagerDlg.cpp:964
 msgid "Re&fresh from Keyserver"
 msgstr "Vom Schlüsselserver aktualisieren"
 
-#: Src/wptKeyManagerDlg.cpp:896
+#: Src/wptKeyManagerDlg.cpp:965
 msgid "Set preferred Keyserver URL"
 msgstr "Setze bevorzugte Keyserver URL"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:897
+#: Src/wptKeyManagerDlg.cpp:966
 msgid "Send Key to Mail Recipient"
 msgstr "Sende Schlüssel an Mailempfänger"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:898
+#: Src/wptKeyManagerDlg.cpp:967
 msgid "Set as Default Key"
 msgstr "Setze als Default Key"
 
-#: Src/wptKeyManagerDlg.cpp:900
+#: Src/wptKeyManagerDlg.cpp:969
 msgid "Key..."
 msgstr "Schlüssel..."
 
-#: Src/wptKeyManagerDlg.cpp:901
+#: Src/wptKeyManagerDlg.cpp:970
 msgid "User ID..."
 msgstr "Benutzerkennung..."
 
-#: Src/wptKeyManagerDlg.cpp:902
+#: Src/wptKeyManagerDlg.cpp:971
 msgid "Photo ID..."
 msgstr "Photo ID..."
 
-#: Src/wptKeyManagerDlg.cpp:903
+#: Src/wptKeyManagerDlg.cpp:972
 msgid "Revoker..."
 msgstr "Revoker..."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:906
+#: Src/wptKeyManagerDlg.cpp:975
 msgid "Key Attributes"
 msgstr "Schlüsselattribute"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:907
+#: Src/wptKeyManagerDlg.cpp:976
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: Src/wptKeyManagerDlg.cpp:908
+#: Src/wptKeyManagerDlg.cpp:977
 msgid "Send to Keyserver"
 msgstr "Sende an Keyserver"
 
-#: Src/wptKeyManagerDlg.cpp:967 Src/wptKeysigDlg.cpp:369
+#: Src/wptKeyManagerDlg.cpp:1036 Src/wptKeysigDlg.cpp:370
 msgid "Could not set keylist window procedure."
 msgstr "Konnte \"keylist window procedure\" nicht setzen."
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1079
+#: Src/wptKeyManagerDlg.cpp:1149
 msgid "Delete key from keyring"
 msgstr "Schlüssel aus Keyring löschen"
 
-#: Src/wptKeyManagerDlg.cpp:1083
+#: Src/wptKeyManagerDlg.cpp:1153
 msgid "Show key properties"
 msgstr "Schlüsseleigenschaften anzeigen"
 
-#: Src/wptKeyManagerDlg.cpp:1087
+#: Src/wptKeyManagerDlg.cpp:1157
 msgid "Sign key"
 msgstr "Signiere Schlüssel"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1091
+#: Src/wptKeyManagerDlg.cpp:1161
 msgid "Import key to keyring"
 msgstr "In Schlüsselbund importieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1095
+#: Src/wptKeyManagerDlg.cpp:1165
 msgid "Export key to a file"
 msgstr "Schlüssel in Datei exportieren"
 
 # c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1214
+#: Src/wptKeyManagerDlg.cpp:1284
 msgid "New"
 msgstr "Neu"
 
-#: Src/wptKeyManagerDlg.cpp:1221
+#: Src/wptKeyManagerDlg.cpp:1291
 msgid "Could not access public keyring"
 msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
 
-#: Src/wptKeyManagerDlg.cpp:1261 Src/wptKeysignDlg.cpp:230
+#: Src/wptKeyManagerDlg.cpp:1331 Src/wptKeysignDlg.cpp:230
 #: Src/wptKeysignDlg.cpp:249 Src/wptKeysignDlg.cpp:326
-#: Src/wptKeysignDlg.cpp:343 Src/wptKeysignDlg.cpp:347
+#: Src/wptKeysignDlg.cpp:343 Src/wptKeysignDlg.cpp:348
 msgid "Key Signing"
 msgstr "Schlüsselsignierung"
 
-#: Src/wptKeyManagerDlg.cpp:1284
+#: Src/wptKeyManagerDlg.cpp:1355
 msgid "Key already revoked!"
 msgstr "Schlüssel ist bereits widerrufen!"
 
-#: Src/wptKeyManagerDlg.cpp:1296 Src/wptKeyRevokeDlg.cpp:67
-#: Src/wptKeyRevokeDlg.cpp:89 Src/wptKeyRevokeDlg.cpp:131
-#: Src/wptKeyRevokeDlg.cpp:136 Src/wptKeyRevokeDlg.cpp:143
-#: Src/wptKeyRevokeDlg.cpp:159
-msgid "Key Revocation"
-msgstr "Schlüsselwiderruf"
+#: Src/wptKeyManagerDlg.cpp:1367 Src/wptKeyRevokeDlg.cpp:72
+#: Src/wptKeyRevokeDlg.cpp:100 Src/wptKeyRevokeDlg.cpp:138
+#: Src/wptKeyRevokeDlg.cpp:143 Src/wptKeyRevokeDlg.cpp:151
+#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:173
+msgid "Key Revocation Cert"
+msgstr "Schlüsselwiderruf Zertifikat"
 
-#: Src/wptKeyManagerDlg.cpp:1307
+#: Src/wptKeyManagerDlg.cpp:1377
 msgid "It does not make any sense with a key pair!"
 msgstr "Diese Aktion macht keinen Sinn mit einem Schlüsselpaar!"
 
-#: Src/wptKeyManagerDlg.cpp:1331
+#: Src/wptKeyManagerDlg.cpp:1403
 msgid "Key Signature List"
 msgstr "Schlüssel-Signatur-Liste"
 
-#: Src/wptKeyManagerDlg.cpp:1351 Src/wptKeyPropsDlg.cpp:271
+#: Src/wptKeyManagerDlg.cpp:1422 Src/wptKeyPropsDlg.cpp:282
 msgid "Key Properties"
 msgstr "Schlüsseleigenschaften"
 
-#: Src/wptKeyManagerDlg.cpp:1365
+#: Src/wptKeyManagerDlg.cpp:1437
 msgid ""
 "This is only useful when the keyring has been modified (sign a key...).\n"
 "Do you really want to reload the keycache?"
@@ -3313,31 +3328,31 @@
 "Signierung etc.)\n"
 "Möchten Sie den Zwischenspeicher reinitialisieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1406
+#: Src/wptKeyManagerDlg.cpp:1478
 msgid "Smart Card support is not available."
 msgstr "SmartCard-Unterstützung ist nicht verfügbar."
 
-#: Src/wptKeyManagerDlg.cpp:1433 Src/wptKeyserverDlg.cpp:437
+#: Src/wptKeyManagerDlg.cpp:1505 Src/wptKeyserverDlg.cpp:439
 msgid "Keyserver Access"
 msgstr "Schlüsselserver-Zugriff"
 
-#: Src/wptKeyManagerDlg.cpp:1449
+#: Src/wptKeyManagerDlg.cpp:1521
 msgid "GnuPG Options"
 msgstr "GnuPG Optionen"
 
-#: Src/wptKeyManagerDlg.cpp:1454
+#: Src/wptKeyManagerDlg.cpp:1526
 msgid "Choose Name of the Key File"
 msgstr "Den Namen der Schlüsseldatei wählen"
 
-#: Src/wptKeyManagerDlg.cpp:1490
+#: Src/wptKeyManagerDlg.cpp:1564
 msgid "There is no corresponding secret key for this key."
 msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel vorhanden."
 
-#: Src/wptKeyManagerDlg.cpp:1495
+#: Src/wptKeyManagerDlg.cpp:1569
 msgid "You can only export one secret key."
 msgstr "Sie können nur einen geheimen Schlüssel exportieren."
 
-#: Src/wptKeyManagerDlg.cpp:1500
+#: Src/wptKeyManagerDlg.cpp:1574
 msgid ""
 "This operation will export your *SECRET* key!\n"
 "\n"
@@ -3355,21 +3370,21 @@
 "\n"
 "Wirklich den Schlüssel exportieren?"
 
-#: Src/wptKeyManagerDlg.cpp:1505
+#: Src/wptKeyManagerDlg.cpp:1579
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: Src/wptKeyManagerDlg.cpp:1570
+#: Src/wptKeyManagerDlg.cpp:1650
 msgid "No key was selected, select all by default."
 msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
 
-#: Src/wptKeyPropsDlg.cpp:196
+#: Src/wptKeyPropsDlg.cpp:207
 #, c-format
 msgid "Card-Type: %s\r\n"
 msgstr ""
 
 # c:\oss\winpt-gpgme\src\wptKeyPropsDlg.cpp:214
-#: Src/wptKeyPropsDlg.cpp:225
+#: Src/wptKeyPropsDlg.cpp:236
 #, c-format
 msgid ""
 "Type: %s\r\n"
@@ -3392,25 +3407,25 @@
 "Cipher: %s\r\n"
 "%s\r\n"
 
-#: Src/wptKeyPropsDlg.cpp:272
+#: Src/wptKeyPropsDlg.cpp:283
 msgid "&Change"
 msgstr "&Ändern"
 
-#: Src/wptKeyPropsDlg.cpp:273
+#: Src/wptKeyPropsDlg.cpp:284
 msgid "&Revokers"
 msgstr "\"&Revokers\""
 
-#: Src/wptKeyPropsDlg.cpp:274
+#: Src/wptKeyPropsDlg.cpp:285
 msgid "Change &Passwd"
 msgstr "&Passwort ändern"
 
-#: Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyPropsDlg.cpp:292
 msgid "Photo-ID not validated."
 msgstr "Foto-ID nicht geprüft."
 
 # msgid "Unknown"
 # msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:313
+#: Src/wptKeyPropsDlg.cpp:324
 msgid ""
 "The status of this key is 'revoked' or 'expired'.\n"
 "You cannot change the ownertrust of such keys."
@@ -3418,11 +3433,11 @@
 "Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
 "Sie können das Vertrauen in solche Schlüssel nicht ändern."
 
-#: Src/wptKeyPropsDlg.cpp:315 Src/wptKeyPropsDlg.cpp:322
+#: Src/wptKeyPropsDlg.cpp:326 Src/wptKeyPropsDlg.cpp:333
 msgid "WinPT Warning"
 msgstr "WinPT Warnung"
 
-#: Src/wptKeyPropsDlg.cpp:319
+#: Src/wptKeyPropsDlg.cpp:330
 msgid ""
 "This is a non-valid key.\n"
 "Modifying the ownertrust has no effect on such keys.\n"
@@ -3433,77 +3448,79 @@
 "Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
 "Trotzdem fortfahren?"
 
-#: Src/wptKeyPropsDlg.cpp:337
+#: Src/wptKeyPropsDlg.cpp:348
 msgid "Ownertrust successfully changed."
 msgstr "Besitzervertrauen erfolgreich geändert."
 
-#: Src/wptKeyPropsDlg.cpp:355 Src/wptKeyRevokersDlg.cpp:134
+#: Src/wptKeyPropsDlg.cpp:366 Src/wptKeyRevokersDlg.cpp:145
 msgid "Key Revokers"
 msgstr "Schlüsselwiderrufer"
 
-#: Src/wptKeyRevokeDlg.cpp:91
+#: Src/wptKeyRevokeDlg.cpp:90
+msgid ""
+"Please move this certificate to a medium where it can bestored in a safe "
+"place (floppy, CDR, etc..).\n"
+"If an attacker gets access to this certificate he can use it to render your "
+"key unusable!"
+msgstr ""
+"Bitte speichern Sie dieses Zertifikat auf einem sicheren Medium.\n"
+"Zum Beispiel einer Diskette, einem USB-Stick oder ähnlichem.\n"
+"Wenn jemand darauf Zugriff bekommt, kann er Ihren Schlüssel unbrauchbar "
+"machen!"
+
+#: Src/wptKeyRevokeDlg.cpp:102
 msgid "Reason for revocation"
-msgstr "Grund der Zurückziehung"
+msgstr "Grund des Widerrufes"
 
-#: Src/wptKeyRevokeDlg.cpp:92
+#: Src/wptKeyRevokeDlg.cpp:103
 msgid "Optional description text"
 msgstr "Optionale Beschreibung"
 
-#: Src/wptKeyRevokeDlg.cpp:94
+#: Src/wptKeyRevokeDlg.cpp:105
 msgid "Output file"
 msgstr "Ausgabedatei"
 
-#: Src/wptKeyRevokeDlg.cpp:96
-msgid ""
-"Please move this certificate to a medium where it can be stored in a safe "
-"place (floppy, CDR, etc..). If an attacker gets access to this certificate "
-"he can use it to render your key unusable!"
-msgstr ""
-"Bitte speichern Sie dieses Zertifikat auf einem Medium, das man verschließen "
-"kann Zum Beispiel einer Diskette, einem USB-Stick oder ähnlichem. Wenn "
-"jemand darauf Zugriff bekommt, kann er Ihren Schlüssel unbrauchbar machen!"
-
-#: Src/wptKeyRevokeDlg.cpp:101
+#: Src/wptKeyRevokeDlg.cpp:107
 msgid "0. No reason specified"
 msgstr "0. Kein Grund angeben"
 
-#: Src/wptKeyRevokeDlg.cpp:102
+#: Src/wptKeyRevokeDlg.cpp:108
 msgid "1. Key has been compromised"
 msgstr "1. Der Schlüssel ist nicht mehr sicher"
 
-#: Src/wptKeyRevokeDlg.cpp:103
+#: Src/wptKeyRevokeDlg.cpp:109
 msgid "2. Key is superseded"
 msgstr "2. Der Schlüssel ist veraltet"
 
-#: Src/wptKeyRevokeDlg.cpp:104
+#: Src/wptKeyRevokeDlg.cpp:110
 msgid "3. Key is no longer used"
 msgstr "3. Der Schlüssel wird nicht mehr benutzt"
 
-#: Src/wptKeyRevokeDlg.cpp:121
+#: Src/wptKeyRevokeDlg.cpp:128
 msgid "Choose File to save the Certificate"
 msgstr "Wählen Sie den Namen für das Zertifikat"
 
-#: Src/wptKeyRevokeDlg.cpp:130
+#: Src/wptKeyRevokeDlg.cpp:137
 msgid "Please select a reason."
 msgstr "Bitte geben Sie einen Grund an."
 
-#: Src/wptKeyRevokeDlg.cpp:164
+#: Src/wptKeyRevokeDlg.cpp:172
 msgid "Revocation certificate generated."
 msgstr "Widerrufs-Zertifikat wurde erstellt."
 
-#: Src/wptKeyRevokersDlg.cpp:50 Src/wptSigList.cpp:57
+#: Src/wptKeyRevokersDlg.cpp:59 Src/wptSigList.cpp:57
 msgid "Algorithm"
 msgstr "Algorithmus"
 
-#: Src/wptKeyRevokersDlg.cpp:90 Src/wptKeyRevokersDlg.cpp:147
+#: Src/wptKeyRevokersDlg.cpp:99 Src/wptKeyRevokersDlg.cpp:158
 msgid "Designated Key Revokers"
 msgstr "\"Designated Key Revokers\""
 
-#: Src/wptKeyRevokersDlg.cpp:133
+#: Src/wptKeyRevokersDlg.cpp:144
 msgid "Designated Revoker Keys"
 msgstr "List der Schlüsselwiderrufer"
 
-#: Src/wptKeyRevokersDlg.cpp:148
+#: Src/wptKeyRevokersDlg.cpp:159
 #, c-format
 msgid "Do you want to retrieve 0x%s via the default keyserver?"
 msgstr "Wollen Sie '0x%s' wirklich vom Standard-Schlüsselserver empfangen?"
@@ -3560,12 +3577,12 @@
 msgid "Keyserver Warning"
 msgstr "Keyserver Warnung"
 
-#: Src/wptKeyserverDlg.cpp:94
+#: Src/wptKeyserverDlg.cpp:95
 #, c-format
 msgid "Key '%s' successfully sent"
 msgstr "Schlüssel '%s' erfolgreich versendet"
 
-#: Src/wptKeyserverDlg.cpp:129
+#: Src/wptKeyserverDlg.cpp:130
 msgid ""
 "WARNING: multiple keys matched request.\n"
 "\n"
@@ -3573,19 +3590,19 @@
 "WARNUNG: Mehrere Schlüssel wurden gefunden.\n"
 "\n"
 
-#: Src/wptKeyserverDlg.cpp:134
+#: Src/wptKeyserverDlg.cpp:135
 msgid "Key(s) successfully received but nothing was changed."
 msgstr "Schlüssel erfolgreich empfangen, aber keine Änderungen durchgeführt."
 
-#: Src/wptKeyserverDlg.cpp:136
+#: Src/wptKeyserverDlg.cpp:137
 msgid "Key(s) sucessfully received and imported."
 msgstr "Schlüssel erfolgreich empfangen und importiert."
 
-#: Src/wptKeyserverDlg.cpp:151
+#: Src/wptKeyserverDlg.cpp:153
 msgid "Imported Keys"
 msgstr "Importierte Schlüssel"
 
-#: Src/wptKeyserverDlg.cpp:181
+#: Src/wptKeyserverDlg.cpp:183
 msgid ""
 "LDAP key import failed.\n"
 "Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3595,103 +3612,103 @@
 "Bitte stellen Sie sicher, dass Sie eine Internetverbindung hergestellt haben "
 "und gpgkeys_ldap.exe installiert ist."
 
-#: Src/wptKeyserverDlg.cpp:193
+#: Src/wptKeyserverDlg.cpp:195
 #, c-format
 msgid "Finger key import failed: %s\n"
 msgstr "Finger Schlüsselimport fehlgeschlagen: %s\n"
 
-#: Src/wptKeyserverDlg.cpp:207
+#: Src/wptKeyserverDlg.cpp:209
 msgid "This is not a valid OpenPGP key."
 msgstr "Dies ist kein gültiger OpenPGP Schlüssel."
 
-#: Src/wptKeyserverDlg.cpp:354
+#: Src/wptKeyserverDlg.cpp:356
 msgid "Please select one of the servers."
 msgstr "Bitte einen der Server auswählen."
 
-#: Src/wptKeyserverDlg.cpp:359
+#: Src/wptKeyserverDlg.cpp:361
 msgid "Only HTTP keyserver can be used."
 msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
 
-#: Src/wptKeyserverDlg.cpp:379
+#: Src/wptKeyserverDlg.cpp:381
 msgid "DNS Name"
 msgstr "DNS Name"
 
-#: Src/wptKeyserverDlg.cpp:380
+#: Src/wptKeyserverDlg.cpp:382
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: Src/wptKeyserverDlg.cpp:381
+#: Src/wptKeyserverDlg.cpp:383
 msgid "Default"
 msgstr "Standard"
 
-#: Src/wptKeyserverDlg.cpp:382
+#: Src/wptKeyserverDlg.cpp:384
 msgid "Port"
 msgstr "Port"
 
-#: Src/wptKeyserverDlg.cpp:438 Src/wptKeyserverSearchDlg.cpp:62
+#: Src/wptKeyserverDlg.cpp:440 Src/wptKeyserverSearchDlg.cpp:62
 msgid "&Receive"
 msgstr "&Empfangen"
 
-#: Src/wptKeyserverDlg.cpp:440
+#: Src/wptKeyserverDlg.cpp:442
 msgid "Send key (default is receiving)"
 msgstr "Schlüssel senden (sonst empfangen)"
 
-#: Src/wptKeyserverDlg.cpp:442
+#: Src/wptKeyserverDlg.cpp:444
 msgid "Please enter the key ID or email address you search for"
 msgstr "Bitte die key ID oder Email Adresse angeben die gesucht wird"
 
-#: Src/wptKeyserverDlg.cpp:443
+#: Src/wptKeyserverDlg.cpp:445
 msgid "&Search"
 msgstr "&Suchen"
 
-#: Src/wptKeyserverDlg.cpp:444
+#: Src/wptKeyserverDlg.cpp:446
 msgid "C&hange"
 msgstr "Ä&ndern"
 
-#: Src/wptKeyserverDlg.cpp:445
+#: Src/wptKeyserverDlg.cpp:447
 msgid "Set &default"
 msgstr "Als &Standard"
 
-#: Src/wptKeyserverDlg.cpp:480 Src/wptProxySettingsDlg.cpp:66
+#: Src/wptKeyserverDlg.cpp:482 Src/wptProxySettingsDlg.cpp:66
 #: Src/wptProxySettingsDlg.cpp:75 Src/wptProxySettingsDlg.cpp:82
 #: Src/wptProxySettingsDlg.cpp:87 Src/wptProxySettingsDlg.cpp:92
 #: Src/wptProxySettingsDlg.cpp:138 Src/wptProxySettingsDlg.cpp:169
 msgid "Proxy Settings"
 msgstr "Proxy Einstellungen"
 
-#: Src/wptKeyserverDlg.cpp:488 Src/wptKeyserverDlg.cpp:517
+#: Src/wptKeyserverDlg.cpp:490 Src/wptKeyserverDlg.cpp:519
 msgid "Please select one of the keyservers."
 msgstr "Bitte einen Keyserver auswählen."
 
-#: Src/wptKeyserverDlg.cpp:495
+#: Src/wptKeyserverDlg.cpp:497
 msgid "This is not implemented yet!"
 msgstr "Das ist (leider) noch nicht implementiert!"
 
-#: Src/wptKeyserverDlg.cpp:501 Src/wptKeyserverDlg.cpp:530
+#: Src/wptKeyserverDlg.cpp:503 Src/wptKeyserverDlg.cpp:532
 msgid "Please enter the search pattern."
 msgstr "Bitte Suchmuster eingeben."
 
-#: Src/wptKeyserverDlg.cpp:535
+#: Src/wptKeyserverDlg.cpp:537
 msgid "Only keyids are allowed."
 msgstr "Nur Schlüssel-IDs zulässig"
 
-#: Src/wptKeyserverDlg.cpp:535
+#: Src/wptKeyserverDlg.cpp:537
 msgid "LDAP Keyserver"
 msgstr "LDAP-Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:540
+#: Src/wptKeyserverDlg.cpp:542
 msgid "Only enter the name of the user."
 msgstr "Nur den Namen des Benutzers eingeben."
 
-#: Src/wptKeyserverDlg.cpp:541
+#: Src/wptKeyserverDlg.cpp:543
 msgid "FINGER Keyserver"
 msgstr "FINGER Schlüsselserver"
 
-#: Src/wptKeyserverDlg.cpp:546
+#: Src/wptKeyserverDlg.cpp:548
 msgid "Only email addresses or keyids are allowed."
 msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
 
-#: Src/wptKeyserverDlg.cpp:547
+#: Src/wptKeyserverDlg.cpp:549
 msgid "HKP Keyserver"
 msgstr "HKP Schlüsselserver"
 
@@ -3738,7 +3755,7 @@
 # c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:183
 #: Src/wptKeysigDlg.cpp:134 Src/wptKeysigDlg.cpp:200
 msgid "Non-revocably"
-msgstr "Nicht zurückziehbar"
+msgstr "Nicht widerrufbar"
 
 # c:\oss\winpt-gpgme\src\wptSigList.cpp:49
 #: Src/wptKeysigDlg.cpp:137 Src/wptSigList.cpp:53
@@ -3788,7 +3805,7 @@
 msgid "&Receive Key"
 msgstr "&Schlüssel empfangen"
 
-#: Src/wptKeysigDlg.cpp:431
+#: Src/wptKeysigDlg.cpp:432
 msgid "Really receive all missing keys?"
 msgstr "Alle fehlenden Schlüssel empfangen?"
 
@@ -3865,7 +3882,7 @@
 # c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
 #: Src/wptKeysignDlg.cpp:255
 msgid "Sign non-revocably"
-msgstr "\"nicht-zurückziehbar\" signieren"
+msgstr "nicht-widerrufbar signieren"
 
 #: Src/wptKeysignDlg.cpp:256
 msgid "&Ask for certification level"
@@ -3883,7 +3900,7 @@
 msgid "This key is already signed by your key"
 msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
 
-#: Src/wptKeysignDlg.cpp:349
+#: Src/wptKeysignDlg.cpp:350
 msgid "Key successfully signed."
 msgstr "Schlüssel erfolgreich signiert."
 
@@ -3892,66 +3909,66 @@
 msgstr "Vertrauensliste"
 
 # c:\oss\winpt-gpgme\src\wptMainProc.cpp:115
-#: Src/wptMainProc.cpp:95
+#: Src/wptMainProc.cpp:94
 msgid "Delete Clipboard Contents"
 msgstr "Lösche Zwischenablage"
 
-#: Src/wptMainProc.cpp:96
+#: Src/wptMainProc.cpp:95
 msgid "&Remember the answer"
 msgstr "Nicht mehr nachfragen"
 
-#: Src/wptMainProc.cpp:97
+#: Src/wptMainProc.cpp:96
 msgid "Do you want to delete the contents from the clipboard?"
 msgstr "Wollen sie den Inhalt der Zwischenablage löschen?"
 
-#: Src/wptMainProc.cpp:198
+#: Src/wptMainProc.cpp:197
 msgid "Could not access secret keyring."
 msgstr "Auf denn geheimen Schlüsselbund konnte nicht zugegriffen werden"
 
-#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:78
+#: Src/wptMainProc.cpp:251 Src/wptTextInputDlg.cpp:78
 msgid "Text Input"
 msgstr "Texteingabe"
 
-#: Src/wptMainProc.cpp:271
+#: Src/wptMainProc.cpp:270
 msgid "Unknown OpenPGP type."
 msgstr "Unbekannter OpenPGP Typ."
 
-#: Src/wptMainProc.cpp:344
+#: Src/wptMainProc.cpp:342
 msgid "Could not set current window mode hooks."
 msgstr "Konnte \"Current Window\" Hooks nicht setzen."
 
-#: Src/wptMainProc.cpp:410
+#: Src/wptMainProc.cpp:408
 msgid "Edit Clipboard"
 msgstr "Zwischenablage bearbeiten"
 
-#: Src/wptMainProc.cpp:411
+#: Src/wptMainProc.cpp:409
 msgid "About..."
 msgstr "Über..."
 
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
+#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:419
 msgid "Decrypt/Verify"
 msgstr "Entschlüsseln/Überprüfen"
 
 # c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:431
+#: Src/wptMainProc.cpp:429
 msgid "Current Window"
 msgstr "Aktuelles Fenster"
 
-#: Src/wptMainProc.cpp:487
+#: Src/wptMainProc.cpp:485
 msgid "Remove all passphrases from cache?"
 msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
 
-#: Src/wptMainProc.cpp:488 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:181
+#: Src/wptMainProc.cpp:486 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:182
 msgid "WinPT"
 msgstr "WinPT"
 
-#: Src/wptMainProc.cpp:498
+#: Src/wptMainProc.cpp:496
 msgid "Could not access public keyring, exit WinPT?"
 msgstr ""
 "Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden. WinPT "
 "beenden?"
 
-#: Src/wptMainProc.cpp:532
+#: Src/wptMainProc.cpp:528
 #, c-format
 msgid ""
 "Make sure that the window contains text.\n"
@@ -3960,7 +3977,7 @@
 "Stellen Sie sicher, dass das Fenster Text enthält.\n"
 "%s."
 
-#: Src/wptMainProc.cpp:581 Src/wptPreferencesDlg.cpp:132
+#: Src/wptMainProc.cpp:575 Src/wptPreferencesDlg.cpp:132
 msgid "WinPT Preferences"
 msgstr "WinPT Einstellungen"
 
@@ -4010,15 +4027,15 @@
 msgid "Could not find key for '%s'"
 msgstr "Konnte Schlüssel für '%s' nicht finden"
 
-#: Src/wptMAPI.cpp:438
+#: Src/wptMAPI.cpp:440
 msgid "Please enter a recipient."
 msgstr "Bitte einen Empfänger eingeben."
 
-#: Src/wptMAPI.cpp:438 Src/wptMAPI.cpp:446
+#: Src/wptMAPI.cpp:440 Src/wptMAPI.cpp:448
 msgid "Mail"
 msgstr "E-Mail"
 
-#: Src/wptMAPI.cpp:446
+#: Src/wptMAPI.cpp:448
 msgid "Please enter a message."
 msgstr "Bitte Nachricht eingeben."
 
@@ -4092,7 +4109,7 @@
 "Symmetrisch verschlüsselt.\n"
 "%s verschlüsselte Daten."
 
-#: Src/wptPassphraseCB.cpp:286
+#: Src/wptPassphraseCB.cpp:285
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4103,7 +4120,7 @@
 "Benutzer: \"%s\"\n"
 "%s Schlüssel, ID %s (Hauptschlüssel ID %s)\n"
 
-#: Src/wptPassphraseCB.cpp:292
+#: Src/wptPassphraseCB.cpp:291
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4114,7 +4131,7 @@
 "user: \"%s\"\n"
 "%s key, ID %s\n"
 
-#: Src/wptPassphraseCB.cpp:380
+#: Src/wptPassphraseCB.cpp:379
 #, c-format
 msgid ""
 "Please enter the PIN to unlock your secret card key\n"
@@ -4319,7 +4336,19 @@
 msgid "Please fill out all required fields for authentication."
 msgstr "Bitte alle benötigen Felder für die Authentifizierung eingeben."
 
-#: Src/wptRegistry.cpp:179
+#: Src/wptRegistry.cpp:165
+msgid "GPG Detached Signature"
+msgstr "GPG Abgetrennte Signatur"
+
+#: Src/wptRegistry.cpp:166
+msgid "GPG Encrypted Data"
+msgstr "GPG Verschlüsselte Daten"
+
+#: Src/wptRegistry.cpp:167
+msgid "GPG Armored Data"
+msgstr "GPG ASCII-Geschützte Daten"
+
+#: Src/wptRegistry.cpp:180
 msgid ""
 "WinPT can register some GPG file types for you so they can be processed with "
 "a double click in the explorer.\n"
@@ -4329,11 +4358,11 @@
 "Doppelklick im Explorer öffnen können.\n"
 "Möchten Sie fortfahren?"
 
-#: Src/wptRegistry.cpp:190
+#: Src/wptRegistry.cpp:191
 msgid "WinPT WARNING"
 msgstr "WinPT WARNUNG"
 
-#: Src/wptRegistry.cpp:191
+#: Src/wptRegistry.cpp:192
 #, c-format
 msgid ""
 "It seems there was already a '%s' file type registered by another "
@@ -4343,7 +4372,7 @@
 "Der Dateityp '%s' scheint mit einer anderen Anwendung verknüpft zu sein.\n"
 "Überschreiben?"
 
-#: Src/wptRegistry.cpp:608
+#: Src/wptRegistry.cpp:609
 msgid "Could not write to Registry."
 msgstr "Konnte Werte in Registry nicht speichern"
 
@@ -4375,10 +4404,13 @@
 msgid "Text Input from File"
 msgstr "Texteingabe aus Datei"
 
-#: Src/wptVerifyList.cpp:89 Src/wptVerifyList.cpp:97
+#: Src/wptVerifyList.cpp:99 Src/wptVerifyList.cpp:107
 msgid "Signed"
 msgstr "Signiert"
 
+#~ msgid "&Revoke"
+#~ msgstr "Wider&rufen"
+
 #~ msgid "Choose GPG config file"
 #~ msgstr "Wählen Sie die GPG.conf Datei"
 

Deleted: trunk/Po/winpt.pot
===================================================================
--- trunk/Po/winpt.pot	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Po/winpt.pot	2005-12-30 13:56:10 UTC (rev 129)
@@ -1,3977 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2005-12-18 20:12+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Src/WinPT.cpp:107
-msgid ""
-"Could not initizalize file lock.\n"
-"Native Language Support"
-msgstr ""
-
-#: Src/WinPT.cpp:109 Src/WinPT.cpp:143 Src/WinPT.cpp:173 Src/WinPT.cpp:223
-#: Src/WinPT.cpp:227 Src/WinPT.cpp:337 Src/WinPT.cpp:344 Src/WinPT.cpp:386
-#: Src/WinPT.cpp:414 Src/WinPT.cpp:423 Src/WinPT.cpp:427 Src/WinPT.cpp:444
-#: Src/WinPT.cpp:512 Src/WinPT.cpp:525 Src/WinPT.cpp:574 Src/WinPT.cpp:595
-#: Src/WinPT.cpp:612 Src/wptErrors.cpp:140 Src/wptGPG.cpp:889
-#: Src/wptGPG.cpp:900 Src/wptGPG.cpp:909 Src/wptGPG.cpp:919
-#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:531
-msgid "WinPT Error"
-msgstr ""
-
-#: Src/WinPT.cpp:142
-msgid "Could not create GPG home directory"
-msgstr ""
-
-#: Src/WinPT.cpp:172
-msgid "No useable secret key found."
-msgstr ""
-
-#: Src/WinPT.cpp:222
-msgid "Could not read GnuPG version."
-msgstr ""
-
-#: Src/WinPT.cpp:228
-#, c-format
-msgid ""
-"Sorry, you need a newer GPG version.\n"
-"GPG version %d.%d.%d required GPG version "
-msgstr ""
-
-#: Src/WinPT.cpp:260 Src/wptKeyManagerDlg.cpp:860 Src/wptKeyserverDlg.cpp:55
-#: Src/wptKeyserverDlg.cpp:184 Src/wptKeyserverDlg.cpp:192
-#: Src/wptKeyserverDlg.cpp:208 Src/wptKeyserverDlg.cpp:354
-#: Src/wptKeyserverDlg.cpp:359 Src/wptKeyserverDlg.cpp:489
-#: Src/wptKeyserverDlg.cpp:496 Src/wptKeyserverDlg.cpp:502
-#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverDlg.cpp:531
-#: Src/wptKeyserverSearchDlg.cpp:127
-msgid "Keyserver"
-msgstr ""
-
-#: Src/WinPT.cpp:336
-msgid "Cryptographic selftest failed."
-msgstr ""
-
-#: Src/WinPT.cpp:343
-msgid "A newer GPGME version is needed; at least "
-msgstr ""
-
-#: Src/WinPT.cpp:387
-#, c-format
-msgid ""
-"GPG home directory is not set correctly.\n"
-"Please check the GPG registry settings:\n"
-"%s."
-msgstr ""
-
-#: Src/WinPT.cpp:391
-msgid "Select GPG Public Keyring"
-msgstr ""
-
-#: Src/WinPT.cpp:392 Src/wptGPG.cpp:887 Src/wptGPG.cpp:907
-msgid "GPG Keyrings (*.gpg)"
-msgstr ""
-
-#: Src/WinPT.cpp:413
-msgid "GPG home directory could not be determited."
-msgstr ""
-
-#: Src/WinPT.cpp:421
-msgid ""
-"Could not find the GPG binary (gpg.exe).\n"
-"Do you want to start the GPG preferences to correct  this problem?"
-msgstr ""
-
-#: Src/WinPT.cpp:436
-msgid ""
-"Could not access and/or find the public and secret keyring.\n"
-"If this is an accident, quit the program and fix it.\n"
-"\n"
-"Continue if you want that WinPT offers you more choices.\n"
-msgstr ""
-
-#: Src/WinPT.cpp:467 Src/wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:792
-msgid "Wipe Free Space"
-msgstr ""
-
-#: Src/WinPT.cpp:511
-msgid "Could not register window class"
-msgstr ""
-
-#: Src/WinPT.cpp:525
-msgid "Could not create window"
-msgstr ""
-
-#: Src/WinPT.cpp:593
-msgid ""
-"The keycache was not initialized or is empty.\n"
-"Please check your GPG config (keyrings, pathes...)"
-msgstr ""
-
-#: Src/WinPT.cpp:596
-msgid ""
-"It seems that GPG is not set properly.\n"
-"Do you want to start the GPG preferences dialog?"
-msgstr ""
-
-#: Src/WinPT.cpp:613
-#, c-format
-msgid ""
-"Default key from the GPG options file could not be found.\n"
-"Please check your gpg.conf (options) to correct this:\n"
-"\n"
-"%s: public key not found."
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:53
-msgid "About the GNU Privacy Guard"
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:57
-msgid "About GnuPG"
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:93 Src/wptKeyManagerDlg.cpp:1517
-#: Src/wptMainProc.cpp:575
-msgid "About WinPT"
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:95
-msgid "A free open source privacy tray for Windows based on GnuPG."
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:97
-msgid "For more information you can visit the homepage: http://www.winpt.org"
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:99
-msgid "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>"
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:101
-msgid ""
-"WinPT is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either Version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:106
-msgid ""
-"WinPT is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR "
-"A PARTICULAR PURPOSE. See the General Public License for more details. "
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:110
-msgid "&About GPG..."
-msgstr ""
-
-#: Src/wptAboutDlgs.cpp:111 Src/wptKeyEditDlgs.cpp:1802
-#: Src/wptKeyManagerDlg.cpp:866
-msgid "&Help"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:136 Src/wptCardDlg.cpp:161 Src/wptMainProc.cpp:401
-msgid "Card Manager"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:197
-msgid "No Fingerprint"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:227
-msgid "No OpenPGP smart card detected."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:346
-msgid "No PINs found."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:346 Src/wptCardDlg.cpp:360 Src/wptCardDlg.cpp:365
-#: Src/wptCardDlg.cpp:371 Src/wptCardDlg.cpp:383 Src/wptCardDlg.cpp:397
-#: Src/wptCardDlg.cpp:526 Src/wptCardDlg.cpp:629 Src/wptCardDlg.cpp:634
-#: Src/wptCardDlg.cpp:640 Src/wptCardDlg.cpp:647 Src/wptCardDlg.cpp:652
-#: Src/wptCardDlg.cpp:660 Src/wptCardDlg.cpp:682 Src/wptCardDlg.cpp:709
-#: Src/wptCardDlg.cpp:714 Src/wptCardDlg.cpp:717 Src/wptCardDlg.cpp:742
-#: Src/wptCardDlg.cpp:744 Src/wptCardDlg.cpp:749 Src/wptCardDlg.cpp:754
-#: Src/wptCardDlg.cpp:816 Src/wptCardDlg.cpp:831 Src/wptCardDlg.cpp:834
-#: Src/wptMainProc.cpp:297
-msgid "Card Edit"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:359
-msgid "Only plain ASCII is currently allowed."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:364
-msgid "Only alphabetic characters are allowed."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:371
-msgid "Invalid URL."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:384
-#, c-format
-msgid "Could not modify card attribute: %s"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:397
-msgid "Card attribute changed."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:437
-msgid "Please enter the 'Admin PIN'"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:439
-msgid "Please enter the 'User PIN'"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:441 Src/wptPINDlg.cpp:53
-msgid "Please enter the PIN"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:445
-#, c-format
-msgid ""
-"%s\n"
-"Name: %s %s\n"
-"Serial-No: %s\n"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:525
-msgid ""
-"This operation will override the keys on the card.\n"
-"Still proceed?"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:600 Src/wptKeyEditDlgs.cpp:459
-msgid "&Name"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:601 Src/wptKeygenDlg.cpp:386
-msgid "&Comment (optional)"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:602 Src/wptKeygenDlg.cpp:388
-msgid "&Expire date"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:603
-msgid "Off-card passphrase"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:604 Src/wptKeyEditDlgs.cpp:596 Src/wptKeygenDlg.cpp:392
-msgid "&Never"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:605 Src/wptKeygenDlg.cpp:387
-msgid "Email &address"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:606 Src/wptKeyManagerDlg.cpp:1411
-msgid "Card Key Generation"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:629
-msgid "Please enter your name."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:633
-msgid "Name must be at least 5 characters long."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:639
-msgid "Please enter your e-mail address."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:646
-msgid "Please enter a valid e-mail address."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:652
-msgid "Please enter an off-card passphrase."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:659
-msgid "Please use plain ASCII charset for the fields."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:681 Src/wptKeyEditDlgs.cpp:1296
-msgid "The date you have chosen lies in the past."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:707
-msgid ""
-"Operation was canceled. It seems that there are existing\n"
-"keys on the cards. You need to mark the 'Overwrite' flag."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:716
-msgid "Keys successfully created."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:742
-msgid "Please enter the old card PIN."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:744
-msgid "Please enter the new card PIN."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:749
-msgid "Admin PIN must be minimal 8 characters."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:754
-msgid "PIN must be minimal 6 characters."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:777
-msgid "Change Card PIN"
-msgstr ""
-
-#: Src/wptCardDlg.cpp:815 Src/wptPassphraseDlg.cpp:168
-msgid "Passphrases do not match. Please try again."
-msgstr ""
-
-#: Src/wptCardDlg.cpp:833
-msgid "PIN successfully changed."
-msgstr ""
-
-#: Src/wptCardEdit.cpp:321
-msgid "Please insert the card and click OK or Cancel to abort."
-msgstr ""
-
-#: Src/wptCardEdit.cpp:322
-msgid "GPG Card Status"
-msgstr ""
-
-#: Src/wptCardManager.cpp:54
-msgid ""
-"Please insert the OpenPGP smart card\n"
-"Press OK to continue or Cancel"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:55 Src/wptClipDecryptDlg.cpp:58
-#: Src/wptClipDecryptDlg.cpp:199 Src/wptFileManager.cpp:1230
-#: Src/wptKeyRevokersDlg.cpp:98 Src/wptKeyRevokersDlg.cpp:146
-msgid "user ID not found"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:118 Src/wptClipDecryptDlg.cpp:130
-#: Src/wptClipDecryptDlg.cpp:138 Src/wptClipDecryptDlg.cpp:148
-#: Src/wptClipDecryptDlg.cpp:150 Src/wptFileManager.cpp:1268
-#: Src/wptFileManager.cpp:1319
-msgid "Decryption"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:131 Src/wptFileManager.cpp:1320
-#, c-format
-msgid ""
-"Encrypted with %s key, ID %s.%s\n"
-"Decryption failed: secret key not available."
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:138
-#, c-format
-msgid "Unsupported algorithm: %s"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:146
-msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:166 Src/wptClipEncryptDlg.cpp:208
-#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:231
-#: Src/wptClipSignEncDlg.cpp:199 Src/wptKeyManager.cpp:317
-#: Src/wptKeyManager.cpp:691 Src/wptKeyManager.cpp:921 Src/wptSymEnc.cpp:90
-msgid "GnuPG Status: Finished"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:183
-msgid "Signature Status: Created with a fully trusted key"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:185
-msgid "Signature Status: Created with a marginal trusted key"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:188
-msgid "Signature Status: Created with an UNTRUSTED key"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:191
-msgid "Signature Status: Created with an undefined trusted key"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:200
-msgid "WinPT Verify"
-msgstr ""
-
-#: Src/wptClipDecryptDlg.cpp:201
-#, c-format
-msgid ""
-"%s\n"
-"%s\n"
-"Signature made %s\n"
-"From \"%s\" using key ID 0x%s%s %s"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:58 Src/wptClipEditDlg.cpp:111
-#: Src/wptClipEditDlg.cpp:119 Src/wptClipEditDlg.cpp:158
-#: Src/wptClipEditDlg.cpp:167 Src/wptClipEditDlg.cpp:245
-#: Src/wptClipEditDlg.cpp:250 Src/wptMainProc.cpp:160 Src/wptMainProc.cpp:228
-#: Src/wptMainProc.cpp:271 Src/wptMainProc.cpp:430 Src/wptMainProc.cpp:511
-#: Src/wptMainProc.cpp:515
-msgid "Clipboard"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:101 Src/wptFileManager.cpp:572
-msgid "File Open"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:102 Src/wptClipEditDlg.cpp:150
-#: Src/wptFileManager.cpp:573 Src/wptW32API.cpp:107
-msgid "All Files (*.*)"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:110
-msgid ""
-"The file you want to add is very large.\n"
-"Still proceed?"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:149
-msgid "File Save"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:159 Src/wptFileManager.cpp:107
-#, c-format
-msgid ""
-"\"%s\" already exists.\n"
-"Replace existing file?"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:196 Src/wptMainProc.cpp:170 Src/wptMainProc.cpp:236
-#: Src/wptMainProc.cpp:569
-msgid "Clipboard Editor"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:197
-msgid "&Copy"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:198
-msgid "Clea&r"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:199 Src/wptGPGOptDlg.cpp:53
-#: Src/wptTextInputDlg.cpp:85
-msgid "&Load"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:200 Src/wptClipVerifyDlg.cpp:158
-#: Src/wptFileVerifyDlg.cpp:52 Src/wptGPGOptDlg.cpp:52
-msgid "&Save"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:201
-msgid "Add quotes"
-msgstr ""
-
-#: Src/wptClipEditDlg.cpp:202 Src/wptKeyEditDlgs.cpp:1801
-#: Src/wptKeyserverDlg.cpp:446 Src/wptMDSumDlg.cpp:87
-#: Src/wptOwnertrustDlg.cpp:103
-msgid "&Close"
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:111
-msgid "Recipients unsuable for encryption:\n"
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:119 Src/wptClipEncryptDlg.cpp:140
-#: Src/wptClipEncryptDlg.cpp:194 Src/wptClipEncryptDlg.cpp:201
-#: Src/wptClipEncryptDlg.cpp:232 Src/wptMainProc.cpp:142
-#: Src/wptMainProc.cpp:210
-msgid "Encryption"
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:141
-msgid "&Find"
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:142 Src/wptClipSignEncDlg.cpp:112
-#: Src/wptCommonDlg.cpp:66 Src/wptFileManagerDlg.cpp:84
-#: Src/wptFileManagerDlg.cpp:198 Src/wptFileManagerDlg.cpp:275
-#: Src/wptFileSaveDlg.cpp:58 Src/wptFirstRunDlg.cpp:50
-#: Src/wptKeyEditDlgs.cpp:288 Src/wptKeyEditDlgs.cpp:388
-#: Src/wptKeyEditDlgs.cpp:462 Src/wptKeyEditDlgs.cpp:597
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:394
-#: Src/wptKeygenDlg.cpp:597 Src/wptKeyRevokeDlg.cpp:90
-#: Src/wptKeyserverSearchDlg.cpp:63 Src/wptKeysignDlg.cpp:258
-#: Src/wptPassphraseCB.cpp:83 Src/wptPassphraseDlg.cpp:68 Src/wptPINDlg.cpp:55
-#: Src/wptPreferencesDlg.cpp:149 Src/wptTextInputDlg.cpp:84
-msgid "&Cancel"
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:194 Src/wptClipSignEncDlg.cpp:159
-msgid "You must select at least one key."
-msgstr ""
-
-#: Src/wptClipEncryptDlg.cpp:232
-#, c-format
-msgid "No recipient found with '%s'"
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:66 Src/wptKeyImportStatusDlg.cpp:77
-msgid "Key Import Statistics"
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:88 Src/wptFileManagerDlg.cpp:197
-#: Src/wptFileManagerDlg.cpp:203 Src/wptKeyManager.cpp:468
-msgid "Key Import"
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:89 Src/wptFileManagerDlg.cpp:468
-msgid "&Import"
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:119
-msgid ""
-"Some of the imported keys are secret keys.\n"
-"\n"
-"The ownertrust values of these keys must be\n"
-"set manually via the Key Properties dialog."
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:122 Src/wptClipImportDlg.cpp:151
-#: Src/wptClipImportDlg.cpp:161 Src/wptFileManager.cpp:1651
-#: Src/wptFileManager.cpp:1662 Src/wptImportList.cpp:414
-#: Src/wptImportList.cpp:421 Src/wptImportList.cpp:430
-#: Src/wptImportList.cpp:438 Src/wptImportList.cpp:447
-#: Src/wptKeyManager.cpp:575 Src/wptKeyserverDlg.cpp:217
-msgid "Import"
-msgstr ""
-
-#: Src/wptClipImportDlg.cpp:158
-msgid ""
-"Key without a self signature was dectected!\n"
-"(This key is NOT usable for encryption, etc)\n"
-"\n"
-"Cannot import these key(s)."
-msgstr ""
-
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:187
-#: Src/wptClipSignEncDlg.cpp:178
-msgid "Could not get default key."
-msgstr ""
-
-#: Src/wptClipSignDlg.cpp:104 Src/wptClipSignDlg.cpp:112
-#: Src/wptClipSignDlg.cpp:117 Src/wptClipSignDlg.cpp:141
-#: Src/wptClipSignDlg.cpp:187 Src/wptClipSignDlg.cpp:195
-#: Src/wptClipSignDlg.cpp:214 Src/wptClipSignDlg.cpp:226
-#: Src/wptClipSignEncDlg.cpp:168 Src/wptClipSignEncDlg.cpp:178
-#: Src/wptFileManager.cpp:1083 Src/wptFileManager.cpp:1101
-#: Src/wptFileManager.cpp:1363 Src/wptMainProc.cpp:154 Src/wptMainProc.cpp:216
-msgid "Signing"
-msgstr ""
-
-#: Src/wptClipSignDlg.cpp:196
-#, c-format
-msgid ""
-"No key was chosen.\n"
-"Use the GPG default key '%s'?"
-msgstr ""
-
-#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:160
-#: Src/wptClipSignEncDlg.cpp:187 Src/wptClipSignEncDlg.cpp:196
-#: Src/wptMainProc.cpp:148 Src/wptMainProc.cpp:222
-msgid "Sign & Encrypt"
-msgstr ""
-
-#: Src/wptClipSignEncDlg.cpp:122
-msgid "Select key for signing"
-msgstr ""
-
-#: Src/wptClipSignEncDlg.cpp:123
-msgid "Signing key:"
-msgstr ""
-
-#: Src/wptClipSignEncDlg.cpp:168 Src/wptKeylist.cpp:1121
-msgid "No key was selected."
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:136
-msgid "Signature Information"
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:157 Src/wptClipVerifyDlg.cpp:170
-#: Src/wptClipVerifyDlg.cpp:186 Src/wptClipVerifyDlg.cpp:193
-#: Src/wptClipVerifyDlg.cpp:225 Src/wptClipVerifyDlg.cpp:236
-#: Src/wptFileManager.cpp:1549 Src/wptFileManager.cpp:1604
-#: Src/wptFileManagerDlg.cpp:541 Src/wptFileVerifyDlg.cpp:81
-#: Src/wptFileVerifyDlg.cpp:145 Src/wptMainProc.cpp:180
-#: Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:258 Src/wptMainProc.cpp:266
-#: Src/wptMainProc.cpp:418
-msgid "Verify"
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:187
-#, c-format
-msgid ""
-"Signature made %s using %s key ID 0x%s\n"
-"Cannot check signature: public key not found\n"
-"\n"
-"Do you want to try to retrieve the key from the keyserver?"
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:225
-msgid "Invalid signature state."
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:235
-msgid "Could not extract key or signature information."
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:239
-msgid "The signature is expired!"
-msgstr ""
-
-#: Src/wptClipVerifyDlg.cpp:268 Src/wptFileSaveDlg.cpp:57
-#: Src/wptFileSaveDlg.cpp:84 Src/wptFileSaveDlg.cpp:89
-#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:99
-#: Src/wptFileSaveDlg.cpp:104 Src/wptFileSaveDlg.cpp:110
-msgid "Save Plaintext"
-msgstr ""
-
-#: Src/wptCommonDlg.cpp:65
-msgid "Enter URL to retrieve the public key"
-msgstr ""
-
-#: Src/wptCommonDlg.cpp:67
-msgid "HTTP Key Import"
-msgstr ""
-
-#: Src/wptCommonDlg.cpp:76
-msgid "Please enter a valid URL."
-msgstr ""
-
-#: Src/wptCommonDlg.cpp:123 Src/wptKeyEditDlgs.cpp:706
-#: Src/wptKeyEditDlgs.cpp:777 Src/wptKeyEditDlgs.cpp:813
-#: Src/wptKeyEditDlgs.cpp:825 Src/wptKeyEditDlgs.cpp:893
-#: Src/wptKeyEditDlgs.cpp:900 Src/wptKeyEditDlgs.cpp:918
-#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditDlgs.cpp:970
-#: Src/wptKeyEditDlgs.cpp:1061 Src/wptKeyEditDlgs.cpp:1067
-#: Src/wptKeyEditDlgs.cpp:1219 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1227 Src/wptKeyEditDlgs.cpp:1232
-#: Src/wptKeyEditDlgs.cpp:1268 Src/wptKeyEditDlgs.cpp:1272
-#: Src/wptKeyEditDlgs.cpp:1282 Src/wptKeyEditDlgs.cpp:1297
-#: Src/wptKeyEditDlgs.cpp:1301 Src/wptKeyEditDlgs.cpp:1341
-#: Src/wptKeyEditDlgs.cpp:1346 Src/wptKeyEditDlgs.cpp:1353
-#: Src/wptKeyEditDlgs.cpp:1359 Src/wptKeyEditDlgs.cpp:1364
-#: Src/wptKeyEditDlgs.cpp:1405 Src/wptKeyEditDlgs.cpp:1410
-#: Src/wptKeyEditDlgs.cpp:1416 Src/wptKeyEditDlgs.cpp:1423
-#: Src/wptKeyEditDlgs.cpp:1426 Src/wptKeyEditDlgs.cpp:1463
-#: Src/wptKeyEditDlgs.cpp:1471 Src/wptKeyEditDlgs.cpp:1505
-#: Src/wptKeyEditDlgs.cpp:1513 Src/wptKeyEditDlgs.cpp:1611
-#: Src/wptKeyEditDlgs.cpp:1644 Src/wptKeyEditDlgs.cpp:1669
-#: Src/wptKeyEditDlgs.cpp:1673 Src/wptKeyEditDlgs.cpp:1682
-#: Src/wptKeyEditDlgs.cpp:1782 Src/wptKeyEditDlgs.cpp:1792
-#: Src/wptKeyEditDlgs.cpp:1803 Src/wptKeyEditDlgs.cpp:1832
-#: Src/wptKeyEditDlgs.cpp:1838 Src/wptKeyManagerDlg.cpp:889
-#: Src/wptKeyManagerDlg.cpp:1544
-msgid "Key Edit"
-msgstr ""
-
-#: Src/wptCommonDlg.cpp:124
-msgid "Enter preferred keyserver URL"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:139
-msgid "Could not execute Cryptdisk Server."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:140 Src/wptCryptdisk.cpp:418 Src/wptCryptdisk.cpp:520
-#: Src/wptCryptdisk.cpp:546 Src/wptCryptdisk.cpp:552 Src/wptCryptdisk.cpp:561
-#: Src/wptCryptdisk.cpp:574 Src/wptCryptdisk.cpp:668
-msgid "Cryptdisk Error"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:416
-msgid ""
-"The Cryptdisk service seems to be available but it is not started yet.\n"
-"Please start the service and try again."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:453
-msgid "Please enter a name for the image file."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:454 Src/wptCryptdisk.cpp:469 Src/wptCryptdisk.cpp:475
-#: Src/wptCryptdisk.cpp:481 Src/wptCryptdisk.cpp:650
-msgid "Cryptdisk"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:458
-msgid ""
-"This volume file already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:460
-msgid "Cryptdisk Warning"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:468
-msgid "Please enter the size for the volume"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:474
-msgid "There is not enough free disk space to store the volume."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:480
-msgid "Please enter a passphrase for the volume."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:519
-msgid "Cannot determine the number of drives."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:536
-msgid "Select Crypdisk Volume"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:545
-msgid "Please enter the name of the image file."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:551
-msgid "Please enter a password."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:560
-msgid "Image file does not exist or could not be accessed."
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:599
-#, c-format
-msgid "Drive %s (ID %d); Size %d MB, Readonly=%s"
-msgstr ""
-
-#: Src/wptCryptdisk.cpp:650
-msgid "Please select one drive to umount."
-msgstr ""
-
-#: Src/wptErrors.cpp:47
-#, c-format
-msgid "Could not locate GPG.exe in %s."
-msgstr ""
-
-#: Src/wptErrors.cpp:52
-#, c-format
-msgid ""
-"Could not find keyring entries into the options file in %s or the file does "
-"NOT exist."
-msgstr ""
-
-#: Src/wptErrors.cpp:78
-msgid "General error occured"
-msgstr ""
-
-#: Src/wptErrors.cpp:79
-msgid "Could not open file"
-msgstr ""
-
-#: Src/wptErrors.cpp:80
-msgid "Could not create file"
-msgstr ""
-
-#: Src/wptErrors.cpp:81
-msgid "Could not read file"
-msgstr ""
-
-#: Src/wptErrors.cpp:82
-msgid "Could not write file"
-msgstr ""
-
-#: Src/wptErrors.cpp:83
-msgid "Could not close file"
-msgstr ""
-
-#: Src/wptErrors.cpp:84
-msgid "File does not exist"
-msgstr ""
-
-#: Src/wptErrors.cpp:85
-msgid "Could not delete file"
-msgstr ""
-
-#: Src/wptErrors.cpp:86
-msgid "Could not open Clipboard"
-msgstr ""
-
-#: Src/wptErrors.cpp:87
-msgid "Could not close Clipboard"
-msgstr ""
-
-#: Src/wptErrors.cpp:88
-msgid "Could not empty Clipboard"
-msgstr ""
-
-#: Src/wptErrors.cpp:89
-msgid "Could not set Clipboard data"
-msgstr ""
-
-#: Src/wptErrors.cpp:90
-msgid "Could not get Clipboard data"
-msgstr ""
-
-#: Src/wptErrors.cpp:91
-msgid "There is no text in the Clipboard"
-msgstr ""
-
-#: Src/wptErrors.cpp:92
-msgid "The Clipboard already contains GPG data"
-msgstr ""
-
-#: Src/wptErrors.cpp:93
-msgid "General Clipboard error"
-msgstr ""
-
-#: Src/wptErrors.cpp:94
-msgid "Registry error: "
-msgstr ""
-
-#: Src/wptErrors.cpp:97
-msgid "Could not startup Winsock 2 interface"
-msgstr ""
-
-#: Src/wptErrors.cpp:98
-msgid "Could not resolve hostname"
-msgstr ""
-
-#: Src/wptErrors.cpp:99
-msgid "Could not create new socket"
-msgstr ""
-
-#: Src/wptErrors.cpp:100
-msgid "Could not connect to the host"
-msgstr ""
-
-#: Src/wptErrors.cpp:101
-msgid "Could not send the key to the keyserver"
-msgstr ""
-
-#: Src/wptErrors.cpp:102
-msgid "Could not receive the key from the keyserver"
-msgstr ""
-
-#: Src/wptErrors.cpp:103
-msgid "Socket timed out, no data"
-msgstr ""
-
-#: Src/wptErrors.cpp:104
-msgid "Keyserver returned: no matching keys in database"
-msgstr ""
-
-#: Src/wptErrors.cpp:105
-msgid "Could not register hotkey: "
-msgstr ""
-
-#: Src/wptErrors.cpp:108
-msgid "Could not open directory"
-msgstr ""
-
-#: Src/wptErrors.cpp:109
-msgid "Could not create directory"
-msgstr ""
-
-#: Src/wptErrors.cpp:110
-msgid "Could not extract data from the current window"
-msgstr ""
-
-#: Src/wptErrors.cpp:111
-msgid "Could not load config file"
-msgstr ""
-
-#: Src/wptErrors.cpp:115
-msgid "There is no card in the reader"
-msgstr ""
-
-#: Src/wptErrors.cpp:116
-msgid "There was no reader found"
-msgstr ""
-
-#: Src/wptErrors.cpp:117
-msgid "This is not an OpenPGP card"
-msgstr ""
-
-#: Src/wptErrors.cpp:118
-msgid "Could not lock or unlock volume"
-msgstr ""
-
-#: Src/wptErrors.cpp:119
-msgid "Could not mount volume"
-msgstr ""
-
-#: Src/wptErrors.cpp:120
-msgid "Could not unmount volume"
-msgstr ""
-
-#: Src/wptErrors.cpp:121
-msgid "Could not  open volume"
-msgstr ""
-
-#: Src/wptErrors.cpp:122
-msgid "Drive that belongs to the volume is busy"
-msgstr ""
-
-#: Src/wptErrors.cpp:123
-msgid "Could not query volume information"
-msgstr ""
-
-#: Src/wptErrors.cpp:124
-#, c-format
-msgid "Unknown error=%d"
-msgstr ""
-
-#: Src/wptFileManager.cpp:106 Src/wptFileManager.cpp:128
-#: Src/wptFileManager.cpp:134 Src/wptFileManager.cpp:173
-#: Src/wptFileManager.cpp:298 Src/wptFileManager.cpp:666
-#: Src/wptFileManager.cpp:811 Src/wptFileManager.cpp:925
-#: Src/wptFileManager.cpp:1454 Src/wptFileManager.cpp:1481
-#: Src/wptFileManager.cpp:1500 Src/wptFileManager.cpp:1777
-#: Src/wptFileManager.cpp:1839 Src/wptFileManagerDlg.cpp:488
-#: Src/wptFileStatDlg.cpp:137 Src/wptMainProc.cpp:399 Src/wptMDSumDlg.cpp:124
-msgid "File Manager"
-msgstr ""
-
-#: Src/wptFileManager.cpp:129
-#, c-format
-msgid ""
-"\"%s\" has read-only attribute.\n"
-"Set attribute to normal?"
-msgstr ""
-
-#: Src/wptFileManager.cpp:133
-msgid "Could not reset file attribute to normal."
-msgstr ""
-
-#: Src/wptFileManager.cpp:169
-msgid ""
-"Multi-Media files are already compressed, GPG would compress\n"
-"them anyway and this costs a lot of time.\n"
-"It is possible to disable compression for these files.\n"
-"Do you want to disable it?"
-msgstr ""
-
-#: Src/wptFileManager.cpp:381 Src/wptKeyEditDlgs.cpp:952
-#: Src/wptVerifyList.cpp:88 Src/wptVerifyList.cpp:96
-msgid "Status"
-msgstr ""
-
-#: Src/wptFileManager.cpp:382 Src/wptKeyEditDlgs.cpp:1053
-#: Src/wptKeyRevokersDlg.cpp:52 Src/wptMDSumDlg.cpp:57
-#: Src/wptVerifyList.cpp:87
-msgid "Name"
-msgstr ""
-
-#: Src/wptFileManager.cpp:383
-msgid "Operation"
-msgstr ""
-
-#: Src/wptFileManager.cpp:666
-msgid "Please select a file."
-msgstr ""
-
-#: Src/wptFileManager.cpp:812
-#, c-format
-msgid ""
-"\"%s\" does not seems to be a text file.\n"
-"Do you really want to clearsign it?"
-msgstr ""
-
-#: Src/wptFileManager.cpp:926
-#, c-format
-msgid "\"%s\" does not exist"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1007 Src/wptFileStatDlg.cpp:259
-#: Src/wptFileStatDlg.cpp:266
-msgid "File Status"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1053
-msgid "Enter filename for encrypted file"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1082
-msgid "Could not get default secret key."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1115 Src/wptFileManager.cpp:1399
-#: Src/wptFileManagerDlg.cpp:539 Src/wptMainProc.cpp:198
-#: Src/wptMainProc.cpp:415 Src/wptMainProc.cpp:422
-msgid "Sign"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1128 Src/wptFileManagerDlg.cpp:537
-#: Src/wptMainProc.cpp:414 Src/wptMainProc.cpp:419
-msgid "Encrypt"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1155 Src/wptFileManager.cpp:1186
-#: Src/wptFileManager.cpp:1191 Src/wptMainProc.cpp:413
-msgid "Symmetric"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1191
-msgid "Encryption failed."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1218
-msgid "Good signature"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1218
-msgid "BAD signature"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1226
-#, c-format
-msgid ""
-"Signature made %s using %s key ID %s\n"
-"%s from \"%s\""
-msgstr ""
-
-#: Src/wptFileManager.cpp:1231
-msgid "Decrypt Verify"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1279
-msgid "Choose Filename for Output"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1290
-msgid "Please enter filename for plaintext file"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1328 Src/wptFileManagerDlg.cpp:538
-msgid "Decrypt"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1334
-#, c-format
-msgid ""
-"Decryption failed.\n"
-"%s: does not exist."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1376
-msgid "Enter filename for signed file"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1480
-msgid "Could not find detached signature in the clipboard."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1500
-msgid "No files to check."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1517
-msgid "Select Data File"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1519
-msgid "Selected Output File"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1549
-msgid "Invalid file name. Exit"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1659 Src/wptKeyManager.cpp:572
-msgid ""
-"Key without a self signature was dectected!\n"
-"(This key is NOT usable for encryption, etc)\n"
-"\n"
-"Cannot import these key(s)!"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1704 Src/wptKeyManager.cpp:300
-#: Src/wptKeyManager.cpp:336 Src/wptKeyManager.cpp:371
-msgid "No key was selected for export."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1704 Src/wptFileManager.cpp:1727
-#: Src/wptKeyserverDlg.cpp:84
-msgid "Export"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1712 Src/wptKeyManagerDlg.cpp:1477
-#: Src/wptKeyManagerDlg.cpp:1509
-msgid "Choose Name for Key File"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1731 Src/wptKeyEditDlgs.cpp:933
-#: Src/wptKeyEditDlgs.cpp:1249 Src/wptKeyEditDlgs.cpp:1320
-#: Src/wptKeyserverDlg.cpp:95
-msgid "GnuPG status"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1731
-#, c-format
-msgid "Finished (Output: %s)"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1778
-#, c-format
-msgid "%s: no valid OpenPGP data found."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1838
-msgid "Encrypting into a ZIP archive makes sense with multiple files"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1843
-msgid "Choose File Name for Output"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1912
-msgid "Choose a Name for the Archive"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1915
-msgid "Invalid archive name. Exit."
-msgstr ""
-
-#: Src/wptFileManager.cpp:1915 Src/wptFileManager.cpp:1922
-msgid "Encrypt Directory"
-msgstr ""
-
-#: Src/wptFileManager.cpp:1922
-msgid "Could not create zip archive."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:79 Src/wptFileManagerDlg.cpp:145
-msgid "File Encrypt"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:80 Src/wptFileManagerDlg.cpp:271
-msgid "&Text Output"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:81
-msgid "&Wipe Original"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:82
-msgid "Anonymize (throw keyid)"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:83
-msgid "&Select Key for signing"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:144
-msgid "Please select at least one recipient."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:203 Src/wptFileStatDlg.cpp:266
-#: Src/wptKeyManager.cpp:446
-msgid "No valid OpenPGP data found."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:208
-#, c-format
-msgid "File contain(s) %d key(s)."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:270 Src/wptFileManagerDlg.cpp:320
-msgid "File Sign"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:272
-msgid "&Normal Signature"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:273
-msgid "&Detached Signature"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:274
-msgid "&Cleartext Signature"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:320 Src/wptKeyEditDlgs.cpp:1223
-#: Src/wptKeyEditDlgs.cpp:1272 Src/wptKeyEditDlgs.cpp:1346
-#: Src/wptKeyManager.cpp:612 Src/wptKeyManager.cpp:710
-#: Src/wptKeyManager.cpp:746 Src/wptKeyManagerDlg.cpp:1249
-#: Src/wptKeyManagerDlg.cpp:1268 Src/wptKeyManagerDlg.cpp:1301
-#: Src/wptKeyManagerDlg.cpp:1320 Src/wptKeyManagerDlg.cpp:1336
-#: Src/wptKeyManagerDlg.cpp:1468 Src/wptKeyManagerDlg.cpp:1486
-#: Src/wptKeyserverSearchDlg.cpp:127
-msgid "Please select a key."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:381
-msgid "0 Objects marked"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:385
-#, c-format
-msgid "%d Object(s) marked"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:455 Src/wptMainProc.cpp:548
-msgid "File Manager (use drag & drop to add files)"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:457 Src/wptKeyManagerDlg.cpp:831
-#: Src/wptOwnertrustDlg.cpp:98
-msgid "File"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:458 Src/wptKeyManagerDlg.cpp:832
-#: Src/wptKeyManagerDlg.cpp:837 Src/wptKeyManagerDlg.cpp:848
-msgid "Edit"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:459 Src/wptKeyManagerDlg.cpp:833
-msgid "View"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:460
-msgid "&Open..."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:461
-msgid "&Encrypt"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:462 Src/wptFileManagerDlg.cpp:536
-msgid "Encrypt into ZIP"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:463
-msgid "&Decrypt"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:464 Src/wptKeyManagerDlg.cpp:849
-#: Src/wptKeyManagerDlg.cpp:892
-msgid "&Sign"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:465 Src/wptFileManagerDlg.cpp:540
-#: Src/wptMainProc.cpp:416 Src/wptMainProc.cpp:420
-msgid "Sign && Encrypt"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:466
-msgid "&Verify"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:467
-msgid "S&ymmetric"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:469
-msgid "E&xport"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:470 Src/wptMainProc.cpp:412
-msgid "Exit"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:471
-msgid "&Reset"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:472
-msgid "Always on Top"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:473
-msgid "&Paste"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:474
-msgid "&Select All"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:475
-msgid "&Preferences"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:476 Src/wptFileManagerDlg.cpp:543
-msgid "Send as Mail"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:477
-msgid "&List Packets"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:479
-msgid "&Wipe"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:487
-msgid "Could not set filelist window procedure."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:542
-msgid "Wipe"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:544
-msgid "List Packets"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:589
-msgid "&Calc Digest"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:744
-msgid "Are you sure you want to secure delete these files?"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:745 Src/wptMainProc.cpp:98
-msgid "&Yes"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:746 Src/wptMainProc.cpp:99
-msgid "&No"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:789
-msgid "Operation Status: Error"
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:790
-msgid "Operation Status: Done."
-msgstr ""
-
-#: Src/wptFileManagerDlg.cpp:833
-#, c-format
-msgid ""
-"Total Capacity: %12sk\n"
-"Free Space    : %12sk"
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:59
-msgid "&Save additional information"
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:60
-msgid "Save to &file"
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:61
-msgid "Send to &clipboard"
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:74
-msgid "Destination for Plaintext"
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:84
-msgid "Please enter a filename."
-msgstr ""
-
-#: Src/wptFileSaveDlg.cpp:95 Src/wptFileSaveDlg.cpp:110
-msgid "Finished"
-msgstr ""
-
-#: Src/wptFileVerifyDlg.cpp:51
-msgid "File Verify"
-msgstr ""
-
-#: Src/wptFileVerifyDlg.cpp:80
-msgid "Do you want to retrieve the key?"
-msgstr ""
-
-#: Src/wptFirstRunDlg.cpp:47
-msgid "&Generate a GnuPG key pair"
-msgstr ""
-
-#: Src/wptFirstRunDlg.cpp:48
-msgid "&Copy GnuPG keyrings from another location"
-msgstr ""
-
-#: Src/wptFirstRunDlg.cpp:49
-msgid "&Specify a new GnuPG home directory"
-msgstr ""
-
-#: Src/wptGPG.cpp:808
-msgid ""
-"The selected keyring has the read-only file\n"
-"attribute. In this state you do not have write\n"
-"access. Do you want to remove the attribute?"
-msgstr ""
-
-#: Src/wptGPG.cpp:811
-msgid "GPG Information"
-msgstr ""
-
-#: Src/wptGPG.cpp:815
-msgid "Could not reset read-only state."
-msgstr ""
-
-#: Src/wptGPG.cpp:816 Src/wptGPG.cpp:1096 Src/wptGPG.cpp:1105
-msgid "GPG Error"
-msgstr ""
-
-#: Src/wptGPG.cpp:828
-msgid ""
-"You do not have file access to modify the contents of\n"
-"one or both of the selected keyrings.\n"
-"\n"
-"The keyrings are in a read-only state which is propably\n"
-"caused by another program which already opened the files.\n"
-msgstr ""
-
-#: Src/wptGPG.cpp:833
-msgid "GPG Warning"
-msgstr ""
-
-#: Src/wptGPG.cpp:857 Src/wptGPGPrefsDlg.cpp:177 Src/wptGPGPrefsDlg.cpp:183
-#: Src/wptGPGPrefsDlg.cpp:189 Src/wptGPGPrefsDlg.cpp:195
-#: Src/wptGPGPrefsDlg.cpp:200 Src/wptGPGPrefsDlg.cpp:205
-#: Src/wptGPGPrefsDlg.cpp:210 Src/wptGPGPrefsDlg.cpp:224
-#: Src/wptKeyEditDlgs.cpp:1618 Src/wptKeyManagerDlg.cpp:859
-#: Src/wptMainProc.cpp:432 Src/wptPreferencesDlg.cpp:209
-#: Src/wptPreferencesDlg.cpp:258 Src/wptPreferencesDlg.cpp:269
-#: Src/wptPreferencesDlg.cpp:281 Src/wptPreferencesDlg.cpp:294
-#: Src/wptPreferencesDlg.cpp:340 Src/wptRegistry.cpp:608
-msgid "Preferences"
-msgstr ""
-
-#: Src/wptGPG.cpp:858
-#, c-format
-msgid ""
-"%s does not exit.\n"
-"Do you want to create this directory?"
-msgstr ""
-
-#: Src/wptGPG.cpp:886
-msgid "Please choose your public keyring"
-msgstr ""
-
-#: Src/wptGPG.cpp:889 Src/wptGPG.cpp:909
-msgid "No keyring was chosen. Exit."
-msgstr ""
-
-#: Src/wptGPG.cpp:895
-msgid "Overwrite old public keyring?"
-msgstr ""
-
-#: Src/wptGPG.cpp:900 Src/wptGPG.cpp:919
-msgid "Could not copy file."
-msgstr ""
-
-#: Src/wptGPG.cpp:906
-msgid "Please choose your secret keyring"
-msgstr ""
-
-#: Src/wptGPG.cpp:914
-msgid "Overwrite old secret keyring?"
-msgstr ""
-
-#: Src/wptGPG.cpp:964 Src/wptGPG.cpp:1054 Src/wptGPG.cpp:1067
-msgid "Backup"
-msgstr ""
-
-#: Src/wptGPG.cpp:964
-#, c-format
-msgid "Backup keyring \"%s\" failed"
-msgstr ""
-
-#: Src/wptGPG.cpp:1055
-#, c-format
-msgid ""
-"The backup drive '%s' does not seems to accessable.\n"
-"Please insert/check the drive to continue."
-msgstr ""
-
-#: Src/wptGPG.cpp:1067
-#, c-format
-msgid "Invalid backup mode %d"
-msgstr ""
-
-#: Src/wptGPG.cpp:1095
-msgid "No GPG error description available."
-msgstr ""
-
-#: Src/wptGPGME.cpp:332
-msgid "Error during verification process."
-msgstr ""
-
-#: Src/wptGPGME.cpp:333
-msgid "The signature is good."
-msgstr ""
-
-#: Src/wptGPGME.cpp:334
-msgid "The signature is BAD!"
-msgstr ""
-
-#: Src/wptGPGME.cpp:335
-msgid "The signature could not be checked due to a missing key."
-msgstr ""
-
-#: Src/wptGPGME.cpp:336
-msgid "No valid OpenPGP signature."
-msgstr ""
-
-#: Src/wptGPGME.cpp:337
-msgid "Signature Error"
-msgstr ""
-
-#: Src/wptGPGME.cpp:338
-msgid "Good Signature (Expired Key)"
-msgstr ""
-
-#: Src/wptGPGME.cpp:339
-msgid "Good Signature (Revoked Key)"
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:49 Src/wptGPGOptDlg.cpp:99
-msgid "Could not load GnuPG config file!"
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:51
-msgid "GnuPG Configuration File"
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:71
-msgid "The 'gpg.conf' file is not loaded."
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:71 Src/wptGPGOptDlg.cpp:77 Src/wptGPGOptDlg.cpp:82
-#: Src/wptGPGOptDlg.cpp:86 Src/wptGPGOptDlg.cpp:93 Src/wptGPGOptDlg.cpp:99
-msgid "GPG Config"
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:77
-msgid "File contains invalid GnuPG keywords!"
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:82
-msgid "Could not save GnuPG config file."
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:86
-msgid "Successfully saved."
-msgstr ""
-
-#: Src/wptGPGOptDlg.cpp:92
-msgid ""
-"Current data will be lost!\n"
-"Are you sure?"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:127 Src/wptKeyManagerDlg.cpp:1443
-#: Src/wptMainProc.cpp:587
-msgid "GnuPG Preferences"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:129
-msgid "GnuPG home directory  (where both keyrings are located)"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:131
-msgid "GnuPG exe file location (full path with added gpg.exe)"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:133
-msgid "Locale directory (to access the translation files)"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:134
-msgid "Ask for the signature class during key sign"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:135
-msgid "Comment in armored files"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:136
-msgid "Encrypt to this key"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:137
-msgid "General GPG options"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:176
-msgid "Please enter the GnuPG home directory."
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:188
-msgid "Could not save 'HomeDir' in the registry."
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:194
-msgid "Please enter where GPG.exe is located."
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:199
-msgid "Could not find the GPG program in this directory."
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:204
-msgid "Could not save 'gpgProgram' in the registry"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:223
-msgid "Could not get GPG config file"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:256
-msgid "Choose GPG home directory"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:275
-msgid "Choose locale directory"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:281
-msgid "Choose GPG binary"
-msgstr ""
-
-#: Src/wptGPGPrefsDlg.cpp:282
-msgid "Executable Files (*.exe)"
-msgstr ""
-
-#: Src/wptGroupsDlg.cpp:53
-msgid "New Group"
-msgstr ""
-
-#: Src/wptGroupsDlg.cpp:69
-msgid "Please enter the email address"
-msgstr ""
-
-#: Src/wptGroupsDlg.cpp:69
-msgid "Group manager"
-msgstr ""
-
-#: Src/wptHotkey.cpp:41
-msgid "Clipboard Encrypt (ALT+CTRL+E)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:42
-msgid "Clipboard Decrypt/Verify (ALT+CTRL+D)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:43
-msgid "Clipboard Sign (ALT+CTRL+S)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:44
-msgid "Clipboard Sign Encrypt (ALT+CTRL+B)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:45
-msgid "Current Window Encrypt (ALT+SHIFT+E)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:46
-msgid "Current Window Decrypt/Verify (ALT+SHIFT+D)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:47
-msgid "Current Window Sign (ALT+SHIFT+S)"
-msgstr ""
-
-#: Src/wptHotkey.cpp:48
-msgid "Current Window Sign Encrypt (ALT+SHIFT+B"
-msgstr ""
-
-#: Src/wptHotkey.cpp:49
-msgid "Unknown Hotkey"
-msgstr ""
-
-#: Src/wptImagelist.cpp:50 Src/wptKeyManager.cpp:166 Src/wptKeyManager.cpp:171
-#: Src/wptKeyManager.cpp:222 Src/wptKeyManager.cpp:301
-#: Src/wptKeyManager.cpp:308 Src/wptKeyManager.cpp:337
-#: Src/wptKeyManager.cpp:342 Src/wptKeyManager.cpp:349
-#: Src/wptKeyManager.cpp:351 Src/wptKeyManager.cpp:372
-#: Src/wptKeyManager.cpp:389 Src/wptKeyManager.cpp:393
-#: Src/wptKeyManager.cpp:399 Src/wptKeyManager.cpp:417
-#: Src/wptKeyManager.cpp:439 Src/wptKeyManager.cpp:444
-#: Src/wptKeyManager.cpp:447 Src/wptKeyManager.cpp:452
-#: Src/wptKeyManager.cpp:458 Src/wptKeyManager.cpp:463
-#: Src/wptKeyManager.cpp:549 Src/wptKeyManager.cpp:557
-#: Src/wptKeyManager.cpp:612 Src/wptKeyManager.cpp:639
-#: Src/wptKeyManager.cpp:649 Src/wptKeyManager.cpp:660
-#: Src/wptKeyManager.cpp:686 Src/wptKeyManager.cpp:710
-#: Src/wptKeyManager.cpp:717 Src/wptKeyManager.cpp:741
-#: Src/wptKeyManager.cpp:746 Src/wptKeyManager.cpp:772
-#: Src/wptKeyManager.cpp:809 Src/wptKeyManager.cpp:815
-#: Src/wptKeyManager.cpp:919 Src/wptKeyManager.cpp:949
-#: Src/wptKeyManagerDlg.cpp:947 Src/wptKeyManagerDlg.cpp:968
-#: Src/wptKeyManagerDlg.cpp:1222 Src/wptKeyManagerDlg.cpp:1250
-#: Src/wptKeyManagerDlg.cpp:1268 Src/wptKeyManagerDlg.cpp:1275
-#: Src/wptKeyManagerDlg.cpp:1285 Src/wptKeyManagerDlg.cpp:1301
-#: Src/wptKeyManagerDlg.cpp:1307 Src/wptKeyManagerDlg.cpp:1320
-#: Src/wptKeyManagerDlg.cpp:1336 Src/wptKeyManagerDlg.cpp:1368
-#: Src/wptKeyManagerDlg.cpp:1407 Src/wptKeyManagerDlg.cpp:1468
-#: Src/wptKeyManagerDlg.cpp:1486 Src/wptKeyManagerDlg.cpp:1491
-#: Src/wptKeyManagerDlg.cpp:1496 Src/wptKeyManagerDlg.cpp:1571
-#: Src/wptKeyManagerDlg.cpp:1732 Src/wptKeysigDlg.cpp:88
-#: Src/wptKeysigDlg.cpp:99 Src/wptKeysigDlg.cpp:321 Src/wptKeysigDlg.cpp:327
-#: Src/wptKeysigDlg.cpp:370 Src/wptKeysigDlg.cpp:432 Src/wptMainProc.cpp:400
-#: Src/wptMainProc.cpp:558
-msgid "Key Manager"
-msgstr ""
-
-#: Src/wptImportList.cpp:264 Src/wptKeyEditDlgs.cpp:205
-#: Src/wptKeyEditDlgs.cpp:1025 Src/wptKeyEditDlgs.cpp:1086
-#: Src/wptKeyEditDlgs.cpp:1358 Src/wptKeyEditDlgs.cpp:1378
-#: Src/wptKeyEditDlgs.cpp:1415 Src/wptKeyEditDlgs.cpp:1444
-#: Src/wptKeylist.cpp:374 Src/wptKeyPropsDlg.cpp:146 Src/wptKeysigDlg.cpp:136
-#: Src/wptKeysigDlg.cpp:201
-msgid "Revoked"
-msgstr ""
-
-#: Src/wptImportList.cpp:266 Src/wptKeyEditDlgs.cpp:206
-#: Src/wptKeyEditDlgs.cpp:1023 Src/wptKeyEditDlgs.cpp:1279
-#: Src/wptKeylist.cpp:376 Src/wptKeyPropsDlg.cpp:143 Src/wptKeysigDlg.cpp:135
-#: Src/wptKeysigDlg.cpp:202
-msgid "Expired"
-msgstr ""
-
-#: Src/wptImportList.cpp:270
-msgid "secret key"
-msgstr ""
-
-#: Src/wptImportList.cpp:272
-msgid "public key"
-msgstr ""
-
-#: Src/wptImportList.cpp:303 Src/wptKeyEditDlgs.cpp:1103
-msgid "Invalid user ID"
-msgstr ""
-
-#: Src/wptImportList.cpp:352 Src/wptKeylist.cpp:536 Src/wptKeylist.cpp:545
-#: Src/wptKeyManagerDlg.cpp:845 Src/wptKeyserverSearchDlg.cpp:48
-#: Src/wptSigList.cpp:51 Src/wptVerifyList.cpp:91 Src/wptVerifyList.cpp:100
-msgid "User ID"
-msgstr ""
-
-#: Src/wptImportList.cpp:353 Src/wptKeylist.cpp:538 Src/wptKeylist.cpp:548
-#: Src/wptKeyserverSearchDlg.cpp:45
-msgid "Size"
-msgstr ""
-
-#: Src/wptImportList.cpp:354 Src/wptKeyEditDlgs.cpp:949 Src/wptKeylist.cpp:537
-#: Src/wptKeylist.cpp:546 Src/wptKeyRevokersDlg.cpp:51
-#: Src/wptKeyserverSearchDlg.cpp:46 Src/wptSigList.cpp:55
-#: Src/wptVerifyList.cpp:99
-msgid "Key ID"
-msgstr ""
-
-#: Src/wptImportList.cpp:355 Src/wptKeyEditDlgs.cpp:950
-#: Src/wptKeyEditDlgs.cpp:1055 Src/wptKeylist.cpp:552
-#: Src/wptKeyserverSearchDlg.cpp:47 Src/wptSigList.cpp:54
-msgid "Creation"
-msgstr ""
-
-#: Src/wptImportList.cpp:356 Src/wptKeylist.cpp:547
-msgid "Type"
-msgstr ""
-
-#: Src/wptImportList.cpp:429
-msgid ""
-"It is possible that the ASCII-Armor is damaged\n"
-"and thus a CRC error occurs."
-msgstr ""
-
-#: Src/wptKeyCache.cpp:488
-msgid "Load GPG Keyrings..."
-msgstr ""
-
-#: Src/wptKeyCacheDlg.cpp:53
-msgid "WinPT Key Caching"
-msgstr ""
-
-#: Src/wptKeyCacheDlg.cpp:56
-msgid "Caching keyrings, please wait..."
-msgstr ""
-
-#: Src/wptKeyCacheDlg.cpp:70
-msgid "Key Cache"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:179
-msgid "Ultimate"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:194 Src/wptKeyEditDlgs.cpp:1020
-#: Src/wptKeylist.cpp:234 Src/wptKeylist.cpp:336 Src/wptKeylist.cpp:894
-msgid "Never"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:207 Src/wptKeyEditDlgs.cpp:1027
-msgid "OK"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:229
-msgid "user ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:230
-#, c-format
-msgid ""
-"Could not get key information for: \"%s\":\n"
-"%s"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:285
-msgid ""
-"Remember that the image is stored within your public key.  If you use a very "
-"large picture, your key will become very large as well! Keeping the image "
-"close to 240x288 is a good size to use."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:286
-msgid ""
-"Pick an image to use for your photo ID.\n"
-"The image must be a JPEG file."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:287 Src/wptKeyEditDlgs.cpp:387
-#: Src/wptKeysignDlg.cpp:257
-msgid "Passphrase"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:289
-msgid "Add Photo ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:305
-msgid "Select Image File"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:306
-msgid "JPEG Files (*.jpg, *.jpeg)"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:309 Src/wptKeyEditDlgs.cpp:319
-#: Src/wptKeyEditDlgs.cpp:325 Src/wptKeyEditDlgs.cpp:331
-#: Src/wptKeyEditDlgs.cpp:343 Src/wptKeyEditDlgs.cpp:840
-msgid "Add Photo"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:310
-#, c-format
-msgid "'%s' is not a valid JPEG file."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:319 Src/wptKeyRevokeDlg.cpp:135
-msgid "Please enter a file name."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:323
-msgid ""
-"The JPEG is really large.\n"
-"Are you sure you want to use it?"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:331
-msgid "Please enter a passphrase."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:348
-msgid "Photo successfully added."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:349 Src/wptKeyEditDlgs.cpp:427
-#: Src/wptKeyEditDlgs.cpp:509 Src/wptKeyEditDlgs.cpp:673
-#: Src/wptKeyEditDlgs.cpp:1380 Src/wptKeyEditDlgs.cpp:1446
-#: Src/wptKeyEditDlgs.cpp:1526 Src/wptKeyEditDlgs.cpp:1700
-#: Src/wptKeygenDlg.cpp:547 Src/wptKeygenDlg.cpp:663
-#: Src/wptKeyPropsDlg.cpp:338 Src/wptKeyRevokeDlg.cpp:164
-#: Src/wptOwnertrustDlg.cpp:124 Src/wptOwnertrustDlg.cpp:136
-msgid "GnuPG Status"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:385
-msgid "Appointing a key as designated revoker cannot be undone."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:386
-msgid "Public key"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:389 Src/wptKeyEditDlgs.cpp:405
-#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeyEditDlgs.cpp:422
-#: Src/wptKeyEditDlgs.cpp:853
-msgid "Add Revoker"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:405 Src/wptKeyEditDlgs.cpp:1410
-#: Src/wptKeyEditDlgs.cpp:1463 Src/wptKeyEditDlgs.cpp:1505
-#: Src/wptKeyEditDlgs.cpp:1644 Src/wptKeyEditDlgs.cpp:1673
-msgid "Please select a user ID."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:411 Src/wptKeygenDlg.cpp:475
-#: Src/wptKeyRevokeDlg.cpp:143
-msgid "Please enter the passphrase."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:427
-msgid "Revoker successfully addded."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:458
-msgid "Add new User ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:460
-msgid "&Email"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:461
-msgid "&Comment"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:477
-msgid "Please enter a name (min. 5 chars.)"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:477 Src/wptKeyEditDlgs.cpp:481
-#: Src/wptKeyEditDlgs.cpp:486 Src/wptKeyEditDlgs.cpp:490
-#: Src/wptKeyEditDlgs.cpp:507
-msgid "UserID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:481
-msgid ""
-"Please enter the email address in the email field and not in the name field"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:486
-msgid "Please enter an email address."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:490
-msgid "Invalid email address."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:509
-msgid "user ID successfully added."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:592 Src/wptKeyEditDlgs.cpp:789
-msgid "Add new Subkey"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:593
-msgid "Key type"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:594
-msgid "Size in bits"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:595
-msgid "Key expiration"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:638
-msgid "Please select one entry."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:638 Src/wptKeyEditDlgs.cpp:643
-#: Src/wptKeyEditDlgs.cpp:671 Src/wptKeyEditDlgs.cpp:773
-msgid "Add Subkey"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:643
-msgid "DSS uses a fixed keysize of 1024. Size changed."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:673
-msgid "Subkey successfully added."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:773
-#: Src/wptKeyEditDlgs.cpp:840 Src/wptKeyEditDlgs.cpp:853
-#: Src/wptKeyEditDlgs.cpp:893 Src/wptKeyEditDlgs.cpp:1268
-#: Src/wptKeyEditDlgs.cpp:1341 Src/wptKeyEditDlgs.cpp:1400
-#: Src/wptKeyManagerDlg.cpp:1274
-msgid "There is no secret key available!"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:701 Src/wptKeyEditDlgs.cpp:717
-msgid "Add user ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:825
-msgid "Preferred keyserver successfully set."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:898
-msgid ""
-"Cannot change passphrase because the key\n"
-"is protected with the IDEA encryption algorithm."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:905
-msgid "Current (old) Passphrase"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:909
-msgid "New Passphrase"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:916 Src/wptKeygenDlg.cpp:503
-#: Src/wptPassphraseDlg.cpp:175
-msgid ""
-"The passphrase contains 8-bit characters.\n"
-"It is not suggested to use charset specific characters."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:931
-msgid "Change Passwd"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:933
-msgid "Passphrase successfully changed."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:948
-msgid "Description"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:951
-msgid "Expires"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditDlgs.cpp:1061
-msgid "Could not find key."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:970
-msgid "No subkey(s) found."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1052 Src/wptKeylist.cpp:540 Src/wptKeylist.cpp:550
-msgid "Validity"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1054
-msgid "Email"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1067
-msgid "No user ID(s) found."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1182
-msgid ""
-"ADDUID   \t\tadd a user ID\r\n"
-"ADDPHOTO  \t\tadd a photo ID\r\n"
-"DELUID    \t\tdelete a user ID\r\n"
-"ADDKEY    \t\tadd a secondard key\r\n"
-"DELKEY    \t\tdelete a secondary key\r\n"
-"ADDREVOKER\t\tadd a revocation key\r\n"
-"EXPIRE    \t\tchange the expire date\r\n"
-"UPDPREF   \t\tupdated preferences\r\n"
-"PASSWD    \t\tchange the passphrase\r\n"
-"PRIMARY   \t\tflag user ID as primary\r\n"
-"TRUST\t    \t\tchange the ownertrust\r\n"
-"REVUID    \t\trevoke a user ID\r\n"
-"REVKEY    \t\trevoke a secondary key\r\n"
-"DISABLE   \t\tdisable a key\r\n"
-"ENABLE    \t\tenable a key\r\n"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1203
-msgid "Key Edit Help"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1219
-msgid "Primary key can not be deleted!"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1227
-msgid "Primary subkey can not be deleted!"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1233
-#, c-format
-msgid ""
-"\"Subkey %s.\"\n"
-"\n"
-"Anything encrypted to the selected subkey will no longer\n"
-"be able to be decrypted.\n"
-"\n"
-"Do you really want to delete this subkey?"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1245
-msgid "Delete Subkey"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1249
-msgid "Subkey successfully deleted."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1280
-msgid ""
-"Key already expired.\n"
-"\n"
-"Do you want to change the expiration date?"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1289 Src/wptKeyEditDlgs.cpp:1292
-msgid "Key Expiration Date"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1313
-msgid "Expire Subkey"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1319
-msgid "Subkey expire date successfully set."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1350
-msgid ""
-"No subkeys were found, if you want to revoke the\n"
-"whole key, please use the Key Manager command directly.\n"
-"\n"
-"This command is only available to revoke single subkeys"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1359
-msgid "Key already revoked."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1376
-msgid "Revoke Subkey"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1380
-msgid "Subkey successfully revoked."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1400
-msgid "Revoke user ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1405
-msgid "Key has only one user ID."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1416
-msgid "This user ID has been already revoked."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1421
-#, c-format
-msgid ""
-"user ID \"%s\".\n"
-"\n"
-"Do you really want to revoke this user ID?"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1442
-msgid "Revoke Signature"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1446
-msgid "User ID successfully revoked"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1523
-msgid "Primary"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1526
-msgid "User ID successfully flagged"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1611
-msgid "No preferences available."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1617
-msgid "MDC feature"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1619 Src/wptKeyeditSetPrefDlg.cpp:116
-msgid "Key Preferences"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1669
-msgid "Primary user ID can not be deleted!"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1679
-#, c-format
-msgid ""
-"user ID \"%s\".\n"
-"\n"
-"Do you really want to delete this user ID?"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1696
-msgid "Delete user ID"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1700
-msgid "User ID successfully deleted"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1782
-msgid "Could not set subkey window procedure."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1792
-msgid "Could not set user ID window procedure."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1800
-msgid "Command>"
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1832
-msgid "Please select a command."
-msgstr ""
-
-#: Src/wptKeyEditDlgs.cpp:1837
-msgid "This command cannot be used with PGP 2 (v3) keys.\n"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:55 Src/wptKeyPropsDlg.cpp:328
-msgid "Change Ownertrust"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:57 Src/wptKeyPropsDlg.cpp:60
-msgid "Don't know"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:58 Src/wptKeyPropsDlg.cpp:61
-msgid "I do NOT trust"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:59 Src/wptKeyPropsDlg.cpp:62
-msgid "I trust marginally"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:60 Src/wptKeyPropsDlg.cpp:63
-msgid "I trust fully"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:61 Src/wptKeyPropsDlg.cpp:65
-msgid "I trust ultimately"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:63
-msgid ""
-"Please decide how far you trust this user to correctly verify other users' "
-"keys (by looking at passports, checking fingerprint from different "
-"source...)?"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:88
-msgid "Please choose one entry."
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:88 Src/wptKeyEditOwnertrustDlg.cpp:95
-#: Src/wptKeyEditOwnertrustDlg.cpp:104 Src/wptKeyManagerDlg.cpp:839
-#: Src/wptKeyManagerDlg.cpp:1528 Src/wptKeyPropsDlg.cpp:275
-#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:121
-#: Src/wptOwnertrustDlg.cpp:133
-msgid "Ownertrust"
-msgstr ""
-
-#: Src/wptKeyEditOwnertrustDlg.cpp:94
-msgid "Do you really want to set this key to ultimate trust?"
-msgstr ""
-
-#: Src/wptKeyeditSetPrefDlg.cpp:115
-msgid "There are no preferences in the list."
-msgstr ""
-
-#: Src/wptKeygenCBDlg.cpp:46
-msgid "Key Generation - Progress Dialog"
-msgstr ""
-
-#: Src/wptKeygenCBDlg.cpp:86 Src/wptKeygenDlg.cpp:311 Src/wptKeygenDlg.cpp:319
-#: Src/wptKeygenDlg.cpp:380 Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:440
-#: Src/wptKeygenDlg.cpp:445 Src/wptKeygenDlg.cpp:450 Src/wptKeygenDlg.cpp:456
-#: Src/wptKeygenDlg.cpp:462 Src/wptKeygenDlg.cpp:476 Src/wptKeygenDlg.cpp:483
-#: Src/wptKeygenDlg.cpp:492 Src/wptKeygenDlg.cpp:497 Src/wptKeygenDlg.cpp:505
-#: Src/wptKeygenDlg.cpp:544 Src/wptKeygenDlg.cpp:637
-#: Src/wptKeyManagerDlg.cpp:1396 Src/wptPassphraseDlg.cpp:95
-msgid "Key Generation"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:300
-msgid ""
-"It is STRONGLY recommend that you backup your keyrings because they both "
-"contain VERY important data.\n"
-"Remember that your hard disk can crash or the files can be deleted by "
-"accident; so it is a good\n"
-"idea to store them on a different mass stoarge like a floppy or CDR!\n"
-"\n"
-"Backup your keyrings now?"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:305
-msgid "WARNING - Important hint"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:307
-msgid "Destination for Public Keyring"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:312 Src/wptKeygenDlg.cpp:320
-#, c-format
-msgid "Could not copy %s -> %s"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:315
-msgid "Destination for Secret Keyring"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:336
-msgid "DSA and ELG (default)"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:337
-msgid "DSA and RSA"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:338
-msgid "DSA sign only"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:339
-msgid "RSA sign only"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:340
-msgid "RSA sign and encrypt"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:341
-msgid "RSA and RSA (PGP)"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:382
-msgid ""
-"NOTE: Key generation can be a lengthy process! Please wait until you get the "
-"message that key generation was finished."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:384
-msgid "Subkey size in &bits"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:385
-msgid "&Real name"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:389 Src/wptKeyRevokeDlg.cpp:93
-msgid "&Passphrase"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:390
-msgid "&Repeat passphrase"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:391
-msgid "Key &type"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:393 Src/wptPassphraseCB.cpp:84
-#: Src/wptPassphraseCB.cpp:92 Src/wptPassphraseDlg.cpp:67 Src/wptPINDlg.cpp:54
-msgid "&Hide Typing"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:434
-msgid "Invalid value. Allowed values 1024-4096 bits."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:439
-msgid "Do you really need such a large key?"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:445 Src/wptKeygenDlg.cpp:617
-msgid "Please enter the name."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:449 Src/wptKeygenDlg.cpp:622
-msgid "Please do not enter the email address in the name field."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:455 Src/wptKeygenDlg.cpp:628
-msgid "Please enter a valid email address."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:461
-msgid "Please do NOT enter the email address in the comment field."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:480 Src/wptPassphraseDlg.cpp:92
-msgid ""
-"Your passphrase should be at least 8 characters long\n"
-"and should contain non-alphabetic characters.\n"
-"\n"
-"Still proceed?"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:491
-msgid "Please repeat the passphrase."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:496
-msgid "Passphrases are NOT identical!"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:547 Src/wptKeygenDlg.cpp:663
-msgid "Key Generation completed"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:590
-msgid "&Prefer RSA keys"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:591
-msgid "Real name:"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:592
-msgid "Email address:"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:593
-msgid "Name and E-Mail Assignment"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:594
-msgid ""
-"Every key pair must have a name associated with it. The name and\n"
-"email address let your correspondents that your public key they are\n"
-"using belongs to us."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:595
-msgid ""
-"By accosiating an email address with your key pair, you will enable WinPT to "
-"assist your correspondents in selecting the correct public\n"
-"key when communicating with you."
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:596 Src/wptKeygenDlg.cpp:618 Src/wptKeygenDlg.cpp:623
-#: Src/wptKeygenDlg.cpp:629 Src/wptKeygenDlg.cpp:634 Src/wptKeygenDlg.cpp:658
-#: Src/wptKeyManagerDlg.cpp:1422
-msgid "Key Generation Wizard"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:598
-msgid "E&xpert"
-msgstr ""
-
-#: Src/wptKeygenDlg.cpp:633
-msgid "Please do not add '<' or '>' to the email address."
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:48
-msgid "Number of public keys"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:49
-msgid "Imported public keys"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:50
-msgid "Number of secret keys"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:51
-msgid "Imported secret keys"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:52
-msgid "Revocation certificates"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:53
-msgid "No (valid) user ID"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:54
-msgid "New user ID's"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:55
-msgid "New sub keys"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:56
-msgid "New signatures"
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:68
-msgid "Revocation certifcate(s) imported."
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:70
-msgid "Secret key(s) imported."
-msgstr ""
-
-#: Src/wptKeyImportStatusDlg.cpp:76
-msgid "No keys updated."
-msgstr ""
-
-#: Src/wptKeylist.cpp:248
-msgid "Key Pair"
-msgstr ""
-
-#: Src/wptKeylist.cpp:250
-msgid "Key Pair (Card)"
-msgstr ""
-
-#: Src/wptKeylist.cpp:251
-msgid "Public Key"
-msgstr ""
-
-#: Src/wptKeylist.cpp:334 Src/wptKeylist.cpp:895
-msgid "None"
-msgstr ""
-
-#: Src/wptKeylist.cpp:338
-msgid "Marginal"
-msgstr ""
-
-#: Src/wptKeylist.cpp:341 Src/wptKeylist.cpp:500
-msgid "Full"
-msgstr ""
-
-#: Src/wptKeylist.cpp:378 Src/wptKeyPropsDlg.cpp:149
-msgid "Disabled"
-msgstr ""
-
-#: Src/wptKeylist.cpp:539 Src/wptKeylist.cpp:549
-msgid "Cipher"
-msgstr ""
-
-#: Src/wptKeylist.cpp:551 Src/wptVerifyList.cpp:90 Src/wptVerifyList.cpp:98
-msgid "Trust"
-msgstr ""
-
-#: Src/wptKeylist.cpp:717 Src/wptPassphraseCB.cpp:110
-#: Src/wptVerifyList.cpp:181
-msgid "Invalid User ID"
-msgstr ""
-
-#: Src/wptKeylist.cpp:892 Src/wptKeyPropsDlg.cpp:66 Src/wptVerifyList.cpp:159
-#: Src/wptVerifyList.cpp:235
-msgid "Unknown"
-msgstr ""
-
-#: Src/wptKeylist.cpp:893
-msgid "Undefined"
-msgstr ""
-
-#: Src/wptKeylist.cpp:936
-#, c-format
-msgid ""
-"It is NOT certain that the key belongs to the person\n"
-"named in the user ID.  If you *really* know what you are\n"
-"doing, you may answer the next question with yes\n"
-"\n"
-"Use \"%s\" anyway?"
-msgstr ""
-
-#: Src/wptKeylist.cpp:944 Src/wptKeylist.cpp:1020
-msgid "Recipients"
-msgstr ""
-
-#: Src/wptKeylist.cpp:1019
-#, c-format
-msgid ""
-"KeyID %s.\n"
-"Do you really want to export a revoked key?"
-msgstr ""
-
-#: Src/wptKeylist.cpp:1121
-msgid "Secret Key List"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:165
-msgid ""
-"This key has expired!\n"
-"Key check failed."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:170
-msgid ""
-"This key has been revoked by its owner!\n"
-"Key check failed."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:220
-msgid "Key status changed."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:341
-msgid "Only one secret key can be exported."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:352
-#, c-format
-msgid "Secret key successfully saved in '%s'."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:394
-#, c-format
-msgid "Key(s) successfully saved in '%s'."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:400
-#, c-format
-msgid "Could not save data to '%s'."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:451
-msgid "No valid OpenPGP keys found."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:456
-msgid ""
-"The key you want to import is dash escacped.\n"
-"Do you want to extract the key?"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:462
-msgid "Cannot import dash escaped OpenPGP keys."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:486 Src/wptKeyManager.cpp:497
-#: Src/wptKeyManager.cpp:511
-msgid "Key Import HTTP"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:486
-#, c-format
-msgid "Invalid HTTP URL: %s"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:537
-msgid "File Import"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:548
-msgid "Could not read key-data from file."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:617
-msgid "Do you really want to confirm each key?"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:618
-msgid "Delete Confirmation"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:640
-#, c-format
-msgid ""
-"Do you really want to delete this key?\n"
-"\n"
-"%s"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:650
-#, c-format
-msgid ""
-"Do you really want to delete this KEY PAIR?\n"
-"\n"
-"Please remember that you are not able to decrypt\n"
-"messages you stored with this key any longer.\n"
-"\n"
-"%s"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:657
-msgid ""
-"The actual secret key is stored on a smartcard.\n"
-"Only the public key and the secret key \n"
-"placeholder will be deleted.\n"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:718
-#, c-format
-msgid "Do you really want to send '%s' to keyserver %s?"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:740
-msgid "Please only select one key."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:808
-msgid "Could not connect to keyserver, abort procedure."
-msgstr ""
-
-#: Src/wptKeyManager.cpp:814
-msgid "Do you really want to refresh all keys in the keyring?"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:873
-#, c-format
-msgid "Default Key: %s"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:875
-#, c-format
-msgid "Default Key: 0x%s"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:895
-#, c-format
-msgid "%d secret keys"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:896
-#, c-format
-msgid "%d keys"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:933
-msgid "Search"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:933
-msgid "Search for:"
-msgstr ""
-
-#: Src/wptKeyManager.cpp:944
-#, c-format
-msgid "String pattern \"%s\" not found."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:428 Src/wptKeyManagerDlg.cpp:884
-msgid "Paste Key from Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:834
-msgid "Key"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:835 Src/wptKeyManagerDlg.cpp:981
-msgid "Groups"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:838
-msgid "Send Mail..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:840
-msgid "&Copy\tCtrl+C"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:841
-msgid "&Paste\tCtrl+V"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:842
-msgid "Search...\tCtrl+F"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:843
-msgid "Select All\tCtrl+A"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:844
-msgid "&Quit"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:846
-msgid "&Expert"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:847
-msgid "&Normal"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:850 Src/wptKeyManagerDlg.cpp:851
-#: Src/wptKeyManagerDlg.cpp:890
-msgid "&Delete"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:852 Src/wptKeyManagerDlg.cpp:891
-msgid "&Revoke"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:853 Src/wptKeyManagerDlg.cpp:887
-msgid "&List Signatures"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:854 Src/wptKeyManagerDlg.cpp:1315
-#: Src/wptKeyTrustPathDlg.cpp:130
-msgid "List Trust Path"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:855
-msgid "&Export..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:856
-msgid "&Import..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:857 Src/wptKeyManagerDlg.cpp:888
-#: Src/wptKeysigDlg.cpp:356
-msgid "&Properties"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:858
-msgid "Options"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:861
-msgid "E&xport Secret Key"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:862
-msgid "Re&load Key Cache"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:863
-msgid "R&everify Signatures"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:864
-msgid "Refresh &Keys (Keyserver)"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:865 Src/wptTextInputDlg.cpp:49
-msgid "Info"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:879
-msgid "Copy User ID to Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:880
-msgid "Copy Key ID to Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:881
-msgid "Copy Fingerprint to Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:882
-msgid "Copy Key Info to Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:883
-msgid "Copy Key to Clipboard"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:885
-msgid "Refresh from Keyserver"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:886
-msgid "Set Implicit &Trust"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:893
-msgid "&Enable"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:894
-msgid "&Disable"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:895
-msgid "Re&fresh from Keyserver"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:896
-msgid "Set preferred Keyserver URL"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:897
-msgid "Send Key to Mail Recipient"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:898
-msgid "Set as Default Key"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:900
-msgid "Key..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:901
-msgid "User ID..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:902
-msgid "Photo ID..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:903
-msgid "Revoker..."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:906
-msgid "Key Attributes"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:907
-msgid "Add"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:908
-msgid "Send to Keyserver"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:967 Src/wptKeysigDlg.cpp:369
-msgid "Could not set keylist window procedure."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1079
-msgid "Delete key from keyring"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1083
-msgid "Show key properties"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1087
-msgid "Sign key"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1091
-msgid "Import key to keyring"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1095
-msgid "Export key to a file"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1214
-msgid "New"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1221
-msgid "Could not access public keyring"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1261 Src/wptKeysignDlg.cpp:230
-#: Src/wptKeysignDlg.cpp:249 Src/wptKeysignDlg.cpp:326
-#: Src/wptKeysignDlg.cpp:343 Src/wptKeysignDlg.cpp:347
-msgid "Key Signing"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1284
-msgid "Key already revoked!"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1296 Src/wptKeyRevokeDlg.cpp:67
-#: Src/wptKeyRevokeDlg.cpp:89 Src/wptKeyRevokeDlg.cpp:131
-#: Src/wptKeyRevokeDlg.cpp:136 Src/wptKeyRevokeDlg.cpp:143
-#: Src/wptKeyRevokeDlg.cpp:159
-msgid "Key Revocation"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1307
-msgid "It does not make any sense with a key pair!"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1331
-msgid "Key Signature List"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1351 Src/wptKeyPropsDlg.cpp:271
-msgid "Key Properties"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1365
-msgid ""
-"This is only useful when the keyring has been modified (sign a key...).\n"
-"Do you really want to reload the keycache?"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1406
-msgid "Smart Card support is not available."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1433 Src/wptKeyserverDlg.cpp:437
-msgid "Keyserver Access"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1449
-msgid "GnuPG Options"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1454
-msgid "Choose Name of the Key File"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1490
-msgid "There is no corresponding secret key for this key."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1495
-msgid "You can only export one secret key."
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1500
-msgid ""
-"This operation will export your *SECRET* key!\n"
-"\n"
-"Never send this key to ANYONE, it should be available\n"
-"ONLY on your machine and you may use this function\n"
-"to copy the key to a safe place.\n"
-"\n"
-"Do you really want to export the key?"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1505
-msgid "WARNING"
-msgstr ""
-
-#: Src/wptKeyManagerDlg.cpp:1570
-msgid "No key was selected, select all by default."
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:196
-#, c-format
-msgid "Card-Type: %s\r\n"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:225
-#, c-format
-msgid ""
-"Type: %s\r\n"
-"Key ID: %s\r\n"
-"Algorithm: %s\r\n"
-"Size: %s bits\r\n"
-"Created: %s\r\n"
-"Expires: %s\r\n"
-"Validity: %s\r\n"
-"Cipher: %s\r\n"
-"%s\r\n"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:272
-msgid "&Change"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:273
-msgid "&Revokers"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:274
-msgid "Change &Passwd"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:281
-msgid "Photo-ID not validated."
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:313
-msgid ""
-"The status of this key is 'revoked' or 'expired'.\n"
-"You cannot change the ownertrust of such keys."
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:315 Src/wptKeyPropsDlg.cpp:322
-msgid "WinPT Warning"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:319
-msgid ""
-"This is a non-valid key.\n"
-"Modifying the ownertrust has no effect on such keys.\n"
-"\n"
-"Do you really want to continue?"
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:337
-msgid "Ownertrust successfully changed."
-msgstr ""
-
-#: Src/wptKeyPropsDlg.cpp:355 Src/wptKeyRevokersDlg.cpp:134
-msgid "Key Revokers"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:91
-msgid "Reason for revocation"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:92
-msgid "Optional description text"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:94
-msgid "Output file"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:96
-msgid ""
-"Please move this certificate to a medium where it can be stored in a safe "
-"place (floppy, CDR, etc..). If an attacker gets access to this certificate "
-"he can use it to render your key unusable!"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:101
-msgid "0. No reason specified"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:102
-msgid "1. Key has been compromised"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:103
-msgid "2. Key is superseded"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:104
-msgid "3. Key is no longer used"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:121
-msgid "Choose File to save the Certificate"
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:130
-msgid "Please select a reason."
-msgstr ""
-
-#: Src/wptKeyRevokeDlg.cpp:164
-msgid "Revocation certificate generated."
-msgstr ""
-
-#: Src/wptKeyRevokersDlg.cpp:50 Src/wptSigList.cpp:57
-msgid "Algorithm"
-msgstr ""
-
-#: Src/wptKeyRevokersDlg.cpp:90 Src/wptKeyRevokersDlg.cpp:147
-msgid "Designated Key Revokers"
-msgstr ""
-
-#: Src/wptKeyRevokersDlg.cpp:133
-msgid "Designated Revoker Keys"
-msgstr ""
-
-#: Src/wptKeyRevokersDlg.cpp:148
-#, c-format
-msgid "Do you want to retrieve 0x%s via the default keyserver?"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:315
-msgid "The network subsystem has failed"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:317
-msgid "Authoritative Answer Host not found"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:319
-msgid "The connection has been dropped because of a network failure"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:321
-#, c-format
-msgid "Unknown Winsock error ec=%d"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:514
-msgid ""
-"Invalid proxy configuration.You need to set a user and a passwordto use "
-"proxy authentication!"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:516
-msgid "Proxy Error"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:542
-msgid ""
-"All entries of this file must have a valid prefix.\n"
-"Currently HKP/HTTP, LDAP and FINGER are supported.\n"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:544
-msgid "Keyserver Error"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:569
-msgid "The keyserver limit is exceeded"
-msgstr ""
-
-#: Src/wptKeyserver.cpp:569
-msgid "Keyserver Warning"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:94
-#, c-format
-msgid "Key '%s' successfully sent"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:129
-msgid ""
-"WARNING: multiple keys matched request.\n"
-"\n"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:134
-msgid "Key(s) successfully received but nothing was changed."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:136
-msgid "Key(s) sucessfully received and imported."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:151
-msgid "Imported Keys"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:181
-msgid ""
-"LDAP key import failed.\n"
-"Please make sure you have an online connection and gpgkeys_ldap.exe is "
-"installed"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:193
-#, c-format
-msgid "Finger key import failed: %s\n"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:207
-msgid "This is not a valid OpenPGP key."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:354
-msgid "Please select one of the servers."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:359
-msgid "Only HTTP keyserver can be used."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:379
-msgid "DNS Name"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:380
-msgid "Protocol"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:381
-msgid "Default"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:382
-msgid "Port"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:438 Src/wptKeyserverSearchDlg.cpp:62
-msgid "&Receive"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:440
-msgid "Send key (default is receiving)"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:442
-msgid "Please enter the key ID or email address you search for"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:443
-msgid "&Search"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:444
-msgid "C&hange"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:445
-msgid "Set &default"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:480 Src/wptProxySettingsDlg.cpp:66
-#: Src/wptProxySettingsDlg.cpp:75 Src/wptProxySettingsDlg.cpp:82
-#: Src/wptProxySettingsDlg.cpp:87 Src/wptProxySettingsDlg.cpp:92
-#: Src/wptProxySettingsDlg.cpp:138 Src/wptProxySettingsDlg.cpp:169
-msgid "Proxy Settings"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:488 Src/wptKeyserverDlg.cpp:517
-msgid "Please select one of the keyservers."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:495
-msgid "This is not implemented yet!"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:501 Src/wptKeyserverDlg.cpp:530
-msgid "Please enter the search pattern."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:535
-msgid "Only keyids are allowed."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:535
-msgid "LDAP Keyserver"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:540
-msgid "Only enter the name of the user."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:541
-msgid "FINGER Keyserver"
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:546
-msgid "Only email addresses or keyids are allowed."
-msgstr ""
-
-#: Src/wptKeyserverDlg.cpp:547
-msgid "HKP Keyserver"
-msgstr ""
-
-#: Src/wptKeyserverSearchDlg.cpp:61
-msgid "Keyserver Searching"
-msgstr ""
-
-#: Src/wptKeyserverSearchDlg.cpp:65
-#, c-format
-msgid "Connect to '%s' to search for \"%s\""
-msgstr ""
-
-#: Src/wptKeyserverSearchDlg.cpp:75
-msgid "Keyserver - search init"
-msgstr ""
-
-#: Src/wptKeyserverSearchDlg.cpp:81
-msgid "Keyserver - check response"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:89
-#, c-format
-msgid ""
-"Are you really sure you want to delete this signature from\n"
-"  \"%s\""
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:123
-#, c-format
-msgid "%s %s signature"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:132 Src/wptKeysigDlg.cpp:203
-msgid "Signature Properties"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:133 Src/wptKeysigDlg.cpp:162 Src/wptKeysigDlg.cpp:199
-msgid "Exportable"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:134 Src/wptKeysigDlg.cpp:200
-msgid "Non-revocably"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:137 Src/wptSigList.cpp:53
-msgid "Class"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:138
-msgid "Expire date"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:139
-msgid "Issuer key"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:140
-msgid "Issuer key ID"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:162
-msgid "Non-exportable"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:296
-msgid "Signature &Properties"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:297
-msgid "Signing &Key Properties"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:320
-msgid "Key not found in keyring, please get it from the keyserver first."
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:327
-msgid "Key not found in keyring."
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:353
-#, c-format
-msgid "Signature List for \"%s\""
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:355
-msgid "&Receive Key"
-msgstr ""
-
-#: Src/wptKeysigDlg.cpp:431
-msgid "Really receive all missing keys?"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:158 Src/wptKeysignDlg.cpp:301
-msgid "Choose Signature Class"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:159
-msgid ""
-"How carefully have you verified the key you are about to sign actually "
-"belongs to the person? If you don't know what to anwser, use \"0\"."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:160
-msgid "(0) I will not answer (default)"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:161
-msgid "(1) I have not checked at all."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:162
-msgid "(2) I have done causal checking."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:163
-msgid "(3) I have done very careful checkings."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:198
-msgid "never"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:236
-#, c-format
-msgid ""
-"pub %d/%s  created: %s    expires: %s\n"
-"\n"
-"Primary key fingerprint: %s\n"
-"\n"
-"\t%s\n"
-"\n"
-"\n"
-"Are you really sure that you want to sign this key with YOUR key?\n"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:249
-msgid "No valid secret key found."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:253
-msgid "Sign local only (non exportable signature)"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:254
-msgid "Signature expires on"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:255
-msgid "Sign non-revocably"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:256
-msgid "&Ask for certification level"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:259
-msgid "&Show photo"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:326
-msgid "Could not get Key ID from key."
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:347
-msgid "This key is already signed by your key"
-msgstr ""
-
-#: Src/wptKeysignDlg.cpp:349
-msgid "Key successfully signed."
-msgstr ""
-
-#: Src/wptKeyTrustPathDlg.cpp:138
-msgid "Trustlist"
-msgstr ""
-
-#: Src/wptMainProc.cpp:95
-msgid "Delete Clipboard Contents"
-msgstr ""
-
-#: Src/wptMainProc.cpp:96
-msgid "&Remember the answer"
-msgstr ""
-
-#: Src/wptMainProc.cpp:97
-msgid "Do you want to delete the contents from the clipboard?"
-msgstr ""
-
-#: Src/wptMainProc.cpp:198
-msgid "Could not access secret keyring."
-msgstr ""
-
-#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:78
-msgid "Text Input"
-msgstr ""
-
-#: Src/wptMainProc.cpp:271
-msgid "Unknown OpenPGP type."
-msgstr ""
-
-#: Src/wptMainProc.cpp:344
-msgid "Could not set current window mode hooks."
-msgstr ""
-
-#: Src/wptMainProc.cpp:410
-msgid "Edit Clipboard"
-msgstr ""
-
-#: Src/wptMainProc.cpp:411
-msgid "About..."
-msgstr ""
-
-#: Src/wptMainProc.cpp:417 Src/wptMainProc.cpp:421
-msgid "Decrypt/Verify"
-msgstr ""
-
-#: Src/wptMainProc.cpp:431
-msgid "Current Window"
-msgstr ""
-
-#: Src/wptMainProc.cpp:487
-msgid "Remove all passphrases from cache?"
-msgstr ""
-
-#: Src/wptMainProc.cpp:488 Src/wptProgressDlg.cpp:122 Src/wptRegistry.cpp:181
-msgid "WinPT"
-msgstr ""
-
-#: Src/wptMainProc.cpp:498
-msgid "Could not access public keyring, exit WinPT?"
-msgstr ""
-
-#: Src/wptMainProc.cpp:532
-#, c-format
-msgid ""
-"Make sure that the window contains text.\n"
-"%s."
-msgstr ""
-
-#: Src/wptMainProc.cpp:581 Src/wptPreferencesDlg.cpp:132
-msgid "WinPT Preferences"
-msgstr ""
-
-#: Src/wptMAPI.cpp:93 Src/wptMAPI.cpp:129
-msgid "MAPI Login failed."
-msgstr ""
-
-#: Src/wptMAPI.cpp:100 Src/wptMAPI.cpp:136 Src/wptMAPI.cpp:366
-msgid "Could not sent mail."
-msgstr ""
-
-#: Src/wptMAPI.cpp:122
-#, c-format
-msgid "GPG Public Key of %s"
-msgstr ""
-
-#: Src/wptMAPI.cpp:244
-msgid "No valid mail addresses found."
-msgstr ""
-
-#: Src/wptMAPI.cpp:244 Src/wptMAPI.cpp:250
-msgid "Secure Attachment"
-msgstr ""
-
-#: Src/wptMAPI.cpp:250
-#, c-format
-msgid "Could not encrypt '%s'"
-msgstr ""
-
-#: Src/wptMAPI.cpp:282
-msgid "Secure Message"
-msgstr ""
-
-#: Src/wptMAPI.cpp:390
-msgid "Add Recipient"
-msgstr ""
-
-#: Src/wptMAPI.cpp:390
-#, c-format
-msgid "Could not find key for '%s'"
-msgstr ""
-
-#: Src/wptMAPI.cpp:438
-msgid "Please enter a recipient."
-msgstr ""
-
-#: Src/wptMAPI.cpp:438 Src/wptMAPI.cpp:446
-msgid "Mail"
-msgstr ""
-
-#: Src/wptMAPI.cpp:446
-msgid "Please enter a message."
-msgstr ""
-
-#: Src/wptMDSumDlg.cpp:56
-msgid "Digest"
-msgstr ""
-
-#: Src/wptMDSumDlg.cpp:86
-msgid "&Save..."
-msgstr ""
-
-#: Src/wptMDSumDlg.cpp:88
-msgid "Print Message Digest"
-msgstr ""
-
-#: Src/wptMDSumDlg.cpp:121
-msgid "Select file to save checksums"
-msgstr ""
-
-#: Src/wptOwnertrustDlg.cpp:100
-msgid ""
-"Here it is possible to save or restore the ownertrust from the 'trustdb' "
-"file. This could be very useful because the values are NOT stored in the "
-"keyring."
-msgstr ""
-
-#: Src/wptOwnertrustDlg.cpp:116
-msgid "Select file name for output"
-msgstr ""
-
-#: Src/wptOwnertrustDlg.cpp:124
-msgid "Ownertrust successfully exported."
-msgstr ""
-
-#: Src/wptOwnertrustDlg.cpp:128
-msgid "Select file name for input"
-msgstr ""
-
-#: Src/wptOwnertrustDlg.cpp:136
-msgid "Ownertrust succefully imported."
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:88
-msgid "Encrypted with the following public key(s)"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:125
-#, c-format
-msgid "Unknown key ID (%s, 0x%s)"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:136
-msgid "Bad passphrase; Enter passphrase again"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:137
-msgid "Please enter your passphrase"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:141
-#, c-format
-msgid ""
-"Symmetric encryption.\n"
-"%s encrypted data."
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:286
-#, c-format
-msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-"%s key, ID %s (main key ID %s)\n"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:292
-#, c-format
-msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-"%s key, ID %s\n"
-msgstr ""
-
-#: Src/wptPassphraseCB.cpp:380
-#, c-format
-msgid ""
-"Please enter the PIN to unlock your secret card key\n"
-"Card: %s"
-msgstr ""
-
-#: Src/wptPassphraseDlg.cpp:59
-msgid "Passphrase Dialog"
-msgstr ""
-
-#: Src/wptPassphraseDlg.cpp:64
-msgid "Repeat Passphrase"
-msgstr ""
-
-#: Src/wptPassphraseDlg.cpp:66
-msgid "Enter Passphrase"
-msgstr ""
-
-#: Src/wptPINDlg.cpp:74
-msgid "Please enter a PIN."
-msgstr ""
-
-#: Src/wptPINDlg.cpp:74 Src/wptPINDlg.cpp:85 Src/wptPINDlg.cpp:91
-#: Src/wptPINDlg.cpp:104 Src/wptPINDlg.cpp:110
-msgid "PIN"
-msgstr ""
-
-#: Src/wptPINDlg.cpp:84
-msgid "'Admin PIN' must be at least 8 characters long."
-msgstr ""
-
-#: Src/wptPINDlg.cpp:90 Src/wptPINDlg.cpp:109
-msgid "PIN's are currently limited to US-ASCII"
-msgstr ""
-
-#: Src/wptPINDlg.cpp:103
-msgid "'User PIN' must be at least 6 characters long."
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:133
-msgid "Do not use any &temporary files"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:134
-msgid "Use clipboard &viewer to display the plaintext"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:135
-msgid "Word wrap cleartext &signatures at column"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:136
-msgid "&Disable hotkeys (Not recommended!)"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:137
-msgid "Skip key validation and assume that keys are always fully trusted"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:138
-msgid "&Automatic keyring backup when WinPT closes"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:139
-msgid "Backup to GPG &home folder"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:140
-msgid "Backup to:"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:141
-msgid "Select &key list mode"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:142
-msgid "Select &wipe mode"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:143
-msgid "Keyserver &config"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:144
-msgid "Cache &passphrases for 'n' seconds"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:145
-msgid "(CTRL+ALT+F to clear the cache)"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:146
-msgid "General options"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:147
-msgid "Clipboard hotkeys"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:148
-msgid "Current window hotkeys"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:206
-msgid ""
-"In most cases it is not a good idea to enable this setting.\n"
-"If you know what you are doing let this flag enabled, otherwise\n"
-"it is safe to leave this flag untouched."
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:238
-msgid "Select GPG backup path"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:245
-msgid "Please select a keyserver.conf file"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:256
-msgid ""
-"Please enter a value that is between 1-3600.\n"
-"It is not a good idea to cache the passphrase more than one hour."
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:269
-msgid "Please enter a value between 1-80."
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:280
-msgid "The specified backup folder is invalid."
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:292
-msgid ""
-"The specified keyserver config file is invalid.\n"
-"\n"
-"Create new default config file?"
-msgstr ""
-
-#: Src/wptPreferencesDlg.cpp:346
-msgid "Hotkeys"
-msgstr ""
-
-#: Src/wptProgressDlg.cpp:122
-msgid "Could not create progress thread."
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:66
-msgid "Invalid host/IP address."
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:75
-msgid "Invalid port number."
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:81
-msgid "Please select a value from 0-65535 for the port"
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:86
-msgid "When you want to use authentication, please fill out both fields."
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:91
-msgid "Please enter a host name and a port."
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:134
-msgid "Proxy host name or IP address"
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:135
-msgid "Server requires &authentication"
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:136
-msgid "User name"
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:137
-msgid "Password"
-msgstr ""
-
-#: Src/wptProxySettingsDlg.cpp:168
-msgid "Please fill out all required fields for authentication."
-msgstr ""
-
-#: Src/wptRegistry.cpp:179
-msgid ""
-"WinPT can register some GPG file types for you so they can be processed with "
-"a double click in the explorer.\n"
-"Do you want to continue?"
-msgstr ""
-
-#: Src/wptRegistry.cpp:190
-msgid "WinPT WARNING"
-msgstr ""
-
-#: Src/wptRegistry.cpp:191
-#, c-format
-msgid ""
-"It seems there was already a '%s' file type registered by another "
-"application.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: Src/wptRegistry.cpp:608
-msgid "Could not write to Registry."
-msgstr ""
-
-#: Src/wptSigList.cpp:52
-msgid "Valid"
-msgstr ""
-
-#: Src/wptSigList.cpp:56
-msgid "Expiration"
-msgstr ""
-
-#: Src/wptSigList.cpp:137
-msgid "  user ID not found"
-msgstr ""
-
-#: Src/wptSymEnc.cpp:72 Src/wptSymEnc.cpp:88
-msgid "Symmetric Encryption"
-msgstr ""
-
-#: Src/wptTextInputDlg.cpp:49
-msgid "Data is too large for copying."
-msgstr ""
-
-#: Src/wptTextInputDlg.cpp:81
-msgid "Enter the text that was signed"
-msgstr ""
-
-#: Src/wptTextInputDlg.cpp:94
-msgid "Text Input from File"
-msgstr ""
-
-#: Src/wptVerifyList.cpp:89 Src/wptVerifyList.cpp:97
-msgid "Signed"
-msgstr ""

Modified: trunk/README
===================================================================
--- trunk/README	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/README	2005-12-30 13:56:10 UTC (rev 129)
@@ -1,5 +1,7 @@
                         The Windows Privacy Tray
                              Version 0.5.5
+			     
+			*** WARNING: this file is obsolete ***
 
 Index
      1. Notice

Modified: trunk/README-0.11.txt
===================================================================
--- trunk/README-0.11.txt	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/README-0.11.txt	2005-12-30 13:56:10 UTC (rev 129)
@@ -7,7 +7,9 @@
 WARNING: This branch is the testing branch of WinPT. The next stable
          branch will be 1.0. 
 
-This branch mainly introduces smart card support for the OpenPGP card.
+This branch mainly introduces smart card support for the OpenPGP card,
+an autoconf based build system and the migration from MyGPGME to the
+orignal GPGME package.
 For more information please visit www.g10-code.com/p-card.html. Alternative
 you may ask on the gnupg-users at gnupg.org list for general information
 about the card and the GPG 1.4 support to use it.

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/ChangeLog	2005-12-30 13:56:10 UTC (rev 129)
@@ -1,3 +1,40 @@
+2005-12-28  Timo Schulz  <ts at g10code.com>
+
+	* wptKeyserverDlg.cpp (show_imported_keys): Decode user IDs.
+	* wptKeyRevokersDlg.cpp (key_revokers_dlg_proc): Likewise.
+	* wptKeylist.cpp (keylist_udp_key): Likewise.
+	* wptKeyManager.cpp (key_get_clip_info, key_get_info): Likewise.
+	* wptClipDecryptDlg.cpp (clip_decrypt_dlg_proc): Fix problem
+	when no signing key was found.
+	* wptKeyManagerDlg.cpp (keymanager_dlg_proc): Properly decode
+	user IDs.
+	(translate_popup_strings): s/Revoke/Revoke Cert.
+	* wptKeyEditDlgs.cpp (do_init_keylist): Do not assume a
+	0x prefixed keyid.
+	* wptKeyEditCB.cpp (editkey_command_handler): Also reset
+	step in case of a bad passphrase.
+	
+2005-12-27  Timo Schulz  <ts at g10code.com>
+
+	* wptListView.cpp (listview_set_view): New.
+	(listview_del_column): New.
+	* wptW32API.cpp (get_locale_date): New.
+	(get_menu_state): New.
+	(force_foreground_window): New.
+	* wptVerifyList.cpp (strtimestamp): Support for
+	locale date formats.
+	* wptGPGUtil.cpp (gpg_revoke_cert): Handle bad
+	passphrases.
+	* wptKeyEditCB.cpp (editkey_command_handler): Immediately
+	return when a bad passphrase was submitted.
+	* wptKeyRevokersDlg.cpp (keyrevokers_dlg_proc): Change
+	column order.
+	* wptKeylist.cpp (keylist_upd_col): New.
+        * wptKeyManagerDlg.cpp (update_ui_items): Deactivate
+	'Revocation' for public keys.
+	(translate_menu_strings): s/Revoke/Revoke Cert.
+	(modify_listview_columns): New.
+	
 2005-12-18  Timo Schulz  <ts at g10code.com>
 
 	* wptKeyManagerDlg.cpp (save_column_size): New.

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/WinPT-en.rc	2005-12-30 13:56:10 UTC (rev 129)
@@ -294,7 +294,7 @@
                     IDC_STATIC,8,42,182,8
     LTEXT           "WinPT is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either Version 2 of the License, or (at your option) any later version.",
                     IDC_ABOUT_GPL1,10,141,223,36
-    GROUPBOX        "Warranty",IDC_STATIC,6,127,240,91
+    GROUPBOX        "Warranty",IDC_ABOUT_GPLINF,6,127,240,91
     LTEXT           "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR A PARTICULAR PURPOSE. See the General Public License for more details.",
                     IDC_ABOUT_GPL2,10,181,231,34
     LTEXT           "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>",
@@ -353,9 +353,9 @@
     GROUPBOX        "",IDC_STATIC,8,52,208,51
     LTEXT           "Passphrase info",IDC_DECRYPT_MSG,11,60,196,39
     LTEXT           "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
-                    145,8
+                    137,8
     CONTROL         "&Hide Typing",IDC_DECRYPT_HIDE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,153,106,65,10
+                    WS_TABSTOP,146,106,72,10
     EDITTEXT        IDC_DECRYPT_PWD,8,117,206,13,ES_PASSWORD | 
                     ES_AUTOHSCROLL
     DEFPUSHBUTTON   "&OK",IDOK,116,137,48,14
@@ -470,7 +470,7 @@
     DEFPUSHBUTTON   "&OK",IDOK,281,132,50,14
 END
 
-IDD_WINPT_KEYEDIT_OWNERTRUST DIALOG DISCARDABLE  0, 0, 188, 114
+IDD_WINPT_KEYEDIT_OWNERTRUST DIALOG DISCARDABLE  0, 0, 183, 114
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Change Ownertrust"
 FONT 8, "MS Sans Serif"
@@ -479,7 +479,7 @@
                     IDC_KEYTRUST_INF,8,7,167,26
     LISTBOX         IDC_KEYTRUST_TRUST,8,38,167,46,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "&OK",IDOK,70,89,50,14
+    DEFPUSHBUTTON   "&OK",IDOK,72,89,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,124,89,50,14
 END
 
@@ -519,21 +519,21 @@
     PUSHBUTTON      "&Cancel",IDCANCEL,227,174,54,15
 END
 
-IDD_WINPT_GPGPREFS DIALOG DISCARDABLE  0, 0, 227, 213
+IDD_WINPT_GPGPREFS DIALOG DISCARDABLE  0, 0, 222, 213
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "GnuPG Preferences"
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "",IDC_STATIC,5,4,208,39
+    GROUPBOX        "",IDC_STATIC,5,4,208,67
     LTEXT           "GnuPG home directory  (where both keyrings are located)",
                     IDC_GPGPREFS_HOMEINF,12,12,181,8
     EDITTEXT        IDC_GPGPREFS_HOMEDIR,12,22,171,12,ES_AUTOHSCROLL
     PUSHBUTTON      "..",IDC_GPGPREFS_HOMEDLG,188,23,20,13
     LTEXT           "GnuPG exe file location (full path with added gpg.exe)",
-                    IDC_GPGPREFS_EXEINF,12,51,170,8
-    EDITTEXT        IDC_GPGPREFS_EXEDIR,12,62,173,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "..",IDC_GPGREFS_EXEDLG,188,62,20,13
-    GROUPBOX        "",IDC_STATIC,6,44,209,34
+                    IDC_GPGPREFS_EXEINF,12,41,170,8
+    EDITTEXT        IDC_GPGPREFS_EXEDIR,12,52,173,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "..",IDC_GPGREFS_EXEDLG,188,51,20,13
+    GROUPBOX        "",IDC_STATIC,6,76,209,37
     LTEXT           "Locale directory (to access the translation files)",
                     IDC_GPGPREFS_LOCALINF,12,85,148,8
     EDITTEXT        IDC_GPGPREFS_LOCALE,12,96,172,12,ES_AUTOHSCROLL
@@ -549,7 +549,6 @@
     LTEXT           "Encrypt to this key",IDC_GPGPREFS_ENCINF,11,173,66,8
     EDITTEXT        IDC_GPGPREFS_ENCTO,78,171,121,13,ES_AUTOHSCROLL
     PUSHBUTTON      "&OK",IDC_GPGPREFS_SAVE,159,193,55,14
-    GROUPBOX        "",IDC_STATIC,6,77,209,36
 END
 
 IDD_WINPT_IMPORT DIALOG DISCARDABLE  0, 0, 321, 118
@@ -635,12 +634,12 @@
     LTEXT           "Key type",IDC_ADDSUBKEY_INFALGO,8,8,49,8
     LISTBOX         IDC_ADDSUBKEY_ALGO,63,7,108,47,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Size in bits",IDC_ADDSUBKEY_INFSIZE,8,63,49,9
+    LTEXT           "Size in bits",IDC_ADDSUBKEY_INFSIZE,8,62,49,9
     COMBOBOX        IDC_ADDSUBKEY_SIZE,63,60,55,48,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Key expiration",IDC_ADDSUBKEY_INFVALID,8,79,56,8
+    LTEXT           "Key expiration",IDC_ADDSUBKEY_INFVALID,8,80,56,8
     CONTROL         "&Never",IDC_ADDSUBKEY_EXPIRE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,63,80,39,10
+                    WS_TABSTOP,63,80,45,10
     CONTROL         "DateTimePicker1",IDC_ADDSUBKEY_EXPDATE,
                     "SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,112,79,
                     53,13
@@ -738,7 +737,7 @@
                     LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,5,323,81
 END
 
-IDD_WINPT_FILE_SIGN DIALOG DISCARDABLE  0, 0, 306, 182
+IDD_WINPT_FILE_SIGN DIALOG DISCARDABLE  0, 0, 306, 167
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "File Sign"
 FONT 8, "MS Sans Serif"
@@ -746,17 +745,18 @@
     CONTROL         "List1",IDC_FILE_SIG_LIST,"SysListView32",LVS_REPORT | 
                     LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | 
                     WS_TABSTOP,8,7,291,77
-    GROUPBOX        "Signature mode",IDC_STATIC,8,87,92,51
+    GROUPBOX        "Signature mode",IDC_FILE_SIG_SIGINF,8,87,107,51
     CONTROL         "&Normal Signature",IDC_FILE_SIG_NORMAL,"Button",
                     BS_AUTORADIOBUTTON,11,99,70,10
     CONTROL         "&Detached Signature",IDC_FILE_SIG_DETACH,"Button",
                     BS_AUTORADIOBUTTON,11,110,79,10
     CONTROL         "Clear&text Signature",IDC_FILE_SIG_CLEAR,"Button",
                     BS_AUTORADIOBUTTON,11,123,75,10
+    GROUPBOX        "Options",IDC_FILE_SIG_OPTINF,120,86,78,53
     CONTROL         "&Text Output",IDC_FILE_SIG_ARMOR,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,142,63,10
-    DEFPUSHBUTTON   "&OK",IDOK,194,160,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,248,160,51,14
+                    BS_AUTOCHECKBOX | WS_TABSTOP,126,99,63,10
+    DEFPUSHBUTTON   "&OK",IDOK,194,144,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,248,144,51,14
 END
 
 IDD_WINPT_FILE_ENCRYPT DIALOG DISCARDABLE  0, 0, 348, 151
@@ -815,9 +815,9 @@
                     WS_BORDER | WS_TABSTOP,9,6,326,156
 END
 
-IDD_WINPT_KEYREVOKE DIALOG DISCARDABLE  0, 0, 174, 202
+IDD_WINPT_KEYREVOKE DIALOG DISCARDABLE  0, 0, 174, 150
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Key Revocation"
+CAPTION "Key Revocation Cert"
 FONT 8, "MS Sans Serif"
 BEGIN
     LTEXT           "Reason for the revocation",IDC_KEYREVOKE_REASONINF,7,6,
@@ -828,14 +828,13 @@
                     107,8
     EDITTEXT        IDC_KEYREVOKE_TEXT,7,68,150,12,ES_AUTOHSCROLL
     LTEXT           "&Passphrase",IDC_KEYREVOKE_PWDINF,7,88,38,8
-    EDITTEXT        IDC_KEYREVOKE_PWD,48,87,109,12,ES_PASSWORD | 
+    EDITTEXT        IDC_KEYREVOKE_PWD,56,87,101,12,ES_PASSWORD | 
                     ES_AUTOHSCROLL
-    LTEXT           "&Output file",IDC_KEYREVOKE_OUTINF,7,107,41,8
-    EDITTEXT        IDC_KEYREVOKE_FILE,48,105,109,12,ES_AUTOHSCROLL
+    LTEXT           "&Output file",IDC_KEYREVOKE_OUTINF,7,107,50,8
+    EDITTEXT        IDC_KEYREVOKE_FILE,57,105,100,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_KEYREVOKE_CHOOSE,157,105,11,13
-    LTEXT           "Static",IDC_KEYREVOKE_HINT,7,130,157,39
-    DEFPUSHBUTTON   "&OK",IDOK,67,182,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,119,182,50,14
+    DEFPUSHBUTTON   "&OK",IDOK,67,130,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,119,130,50,14
 END
 
 IDD_WINPT_PASSWD DIALOG DISCARDABLE  0, 0, 219, 58
@@ -878,11 +877,11 @@
     GROUPBOX        "",IDC_STATIC,7,4,220,52
     LTEXT           "Passphrase info",IDC_DECRYPT_SIGN_MSG,13,15,210,38
     LTEXT           "Please enter your passphrase",IDC_DECRYPT_SIGN_PWDINFO,
-                    7,59,153,8
+                    7,59,147,8
     EDITTEXT        IDC_DECRYPT_SIGN_PWD,7,71,219,12,ES_PASSWORD | 
                     ES_AUTOHSCROLL
     CONTROL         "&Hide Typing",IDC_DECRYPT_SIGN_HIDE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,164,59,66,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,159,59,71,10
     DEFPUSHBUTTON   "&OK",IDOK,131,89,48,14
     PUSHBUTTON      "&Cancel",IDCANCEL,181,89,47,14
 END
@@ -1097,7 +1096,7 @@
     LTEXT           "Decoding data. Please wait...",IDC_STATIC,13,13,107,9
 END
 
-IDD_WINPT_KEYEDIT_ADDREV DIALOG DISCARDABLE  0, 0, 213, 95
+IDD_WINPT_KEYEDIT_ADDREV DIALOG DISCARDABLE  0, 0, 213, 92
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add Revoker"
 FONT 8, "MS Sans Serif"
@@ -1108,10 +1107,10 @@
     LTEXT           "Public key",IDC_ADDREV_KEYINF,7,33,53,8
     COMBOBOX        IDC_ADDREV_KEYLIST,63,33,145,54,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Passphrase",IDC_ADDREV_PWDINF,7,51,38,8
-    EDITTEXT        IDC_ADDREV_PASS,63,50,90,13,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "&OK",IDOK,103,73,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,157,73,50,14
+    LTEXT           "Passphrase",IDC_ADDREV_PWDINF,7,52,38,8
+    EDITTEXT        IDC_ADDREV_PASS,63,51,90,13,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "&OK",IDOK,103,74,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,157,74,50,14
 END
 
 IDD_WINPT_KEYEDIT_ADDPHOTO DIALOG DISCARDABLE  0, 0, 170, 138
@@ -1140,7 +1139,7 @@
     CONTROL         "List1",IDC_MDSUM_LIST,"SysListView32",LVS_REPORT | 
                     LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,5,287,79
     PUSHBUTTON      "&Save...",IDC_MDSUM_COPY,192,86,50,14
-    DEFPUSHBUTTON   "&Exit",IDOK,245,86,50,14
+    DEFPUSHBUTTON   "&Close",IDOK,245,86,50,14
 END
 
 IDD_WINPT_KEYEDIT DIALOG DISCARDABLE  0, 0, 298, 183
@@ -1507,7 +1506,7 @@
     IDD_WINPT_KEYEDIT_OWNERTRUST, DIALOG
     BEGIN
         LEFTMARGIN, 2
-        RIGHTMARGIN, 181
+        RIGHTMARGIN, 176
         TOPMARGIN, 3
         BOTTOMMARGIN, 107
     END
@@ -1531,7 +1530,7 @@
     IDD_WINPT_GPGPREFS, DIALOG
     BEGIN
         LEFTMARGIN, 3
-        RIGHTMARGIN, 220
+        RIGHTMARGIN, 215
         TOPMARGIN, 4
         BOTTOMMARGIN, 208
     END
@@ -1621,7 +1620,7 @@
         LEFTMARGIN, 3
         RIGHTMARGIN, 299
         TOPMARGIN, 3
-        BOTTOMMARGIN, 175
+        BOTTOMMARGIN, 160
     END
 
     IDD_WINPT_FILE_ENCRYPT, DIALOG
@@ -1653,7 +1652,7 @@
         LEFTMARGIN, 2
         RIGHTMARGIN, 170
         TOPMARGIN, 3
-        BOTTOMMARGIN, 196
+        BOTTOMMARGIN, 144
     END
 
     IDD_WINPT_PASSWD, DIALOG
@@ -1797,7 +1796,7 @@
         LEFTMARGIN, 4
         RIGHTMARGIN, 208
         TOPMARGIN, 4
-        BOTTOMMARGIN, 91
+        BOTTOMMARGIN, 88
     END
 
     IDD_WINPT_KEYEDIT_ADDPHOTO, DIALOG
@@ -1938,8 +1937,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,11,3,0
- PRODUCTVERSION 0,11,3,0
+ FILEVERSION 0,11,4,0
+ PRODUCTVERSION 0,11,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1957,14 +1956,14 @@
             VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
-            VALUE "FileVersion", "0.11.3\0"
+            VALUE "FileVersion", "0.11.4\0"
             VALUE "InternalName", "WinPT\0"
             VALUE "LegalCopyright", " Copyright (C) 2005 Timo Schulz\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "WinPT.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Windows Privacy Tray\0"
-            VALUE "ProductVersion", "0.11.3\0"
+            VALUE "ProductVersion", "0.11.4\0"
             VALUE "SpecialBuild", "\0"
         END
     END
@@ -2093,7 +2092,17 @@
         MENUITEM SEPARATOR
         MENUITEM "Select All\tCtrl+A",          ID_KEYMISC_SELALL
     END
-    MENUITEM "&View",                       65535, GRAYED
+    POPUP "View"
+    BEGIN
+        MENUITEM "Key ID",                      ID_KEYMISC_VIEWKEYID
+        , CHECKED, GRAYED
+        MENUITEM "Cipher",                      ID_KEYMISC_VIEWCIPHER
+        , CHECKED, GRAYED
+        MENUITEM "Type",                        ID_KEYMISC_VIEWTYPE
+        , CHECKED, GRAYED
+        MENUITEM "Creation",                    ID_KEYMISC_VIEWCREAT
+        , CHECKED, GRAYED
+    END
     POPUP "&Key"
     BEGIN
         POPUP "&New"

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/resource.h	2005-12-30 13:56:10 UTC (rev 129)
@@ -609,6 +609,9 @@
 #define IDC_IMPSTAT_NSIGINF             1495
 #define IDC_SHOWPREF_PREFINF            1496
 #define IDC_GPGPREFS_LOCDLG             1497
+#define IDC_FILE_SIG_SIGINF             1498
+#define IDC_FILE_SIG_OPTINF             1499
+#define IDC_ABOUT_GPLINF                1501
 #define ID_GPG_ENCRYPT                  40003
 #define ID_GPG_DECRYPT                  40004
 #define ID_GPG_SIGN                     40005
@@ -773,14 +776,18 @@
 #define ID_FILECTX_ENCRYPT_ZIP          40174
 #define ID_FILEMISC_ENCRYPT_ZIP         40175
 #define ID_KEYMISC_DELETE2              40176
+#define ID_KEYMISC_VIEWKEYID            40177
+#define ID_KEYMISC_VIEWCIPHER           40178
+#define ID_KEYMISC_VIEWTYPE             40179
+#define ID_KEYMISC_VIEWCREAT            40180
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        230
-#define _APS_NEXT_COMMAND_VALUE         40177
-#define _APS_NEXT_CONTROL_VALUE         1498
+#define _APS_NEXT_COMMAND_VALUE         40181
+#define _APS_NEXT_CONTROL_VALUE         1502
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/Src/wptAboutDlgs.cpp
===================================================================
--- trunk/Src/wptAboutDlgs.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptAboutDlgs.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -91,6 +91,7 @@
     case WM_INITDIALOG:
 	html_help_init (&cookie);
 	SetWindowText (dlg, _("About WinPT"));
+	SetDlgItemText (dlg, IDC_ABOUT_GPLINF, _("Warranty"));
 	SetDlgItemText (dlg, IDC_ABOUT_INFO, 
                        _("A free open source privacy tray for Windows based on GnuPG."));
 	SetDlgItemText (dlg, IDC_ABOUT_URL, 

Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptClipDecryptDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -37,7 +37,7 @@
 #include "wptDlgs.h"
 #include "wptKeylist.h"
 #include "wptFileManager.h"
-#include "wptCrypto.h"
+#include "wptUTF8.h"
 #include "resource.h"
 
 bool secret_key_available (gpgme_recipient_t rset);
@@ -48,18 +48,18 @@
 get_key_userid (const char *keyid)
 {
     gpgme_key_t key;
-    const char *s;
-    char *p;
+    char *p, *uid;
 
     if (get_pubkey (keyid, &key))
 	return m_strdup (_("user ID not found"));
-    s = key->uids->uid;
-    if (!s)
-	s = _("user ID not found");
-    p = new char[strlen (s) + 4 + 8];
+    uid = utf8_to_wincp2 (key->uids->uid);
+    if (!uid)
+	uid = strdup (_("user ID not found"));
+    p = new char[strlen (uid) + 4 + 8];
     if (!p)
 	BUG (NULL);
-    sprintf (p, "\n    \"%s\"", s);
+    sprintf (p, "\n    \"%s\"", uid);
+    safe_free (uid);
     return p;
 }
 
@@ -141,11 +141,9 @@
     else if (err) {
 	int pgp_type;
 	gpg_clip_get_pgptype (&pgp_type);
-	if (gpgme_err_code (err) == GPG_ERR_NO_DATA
-            && (pgp_type & PGP_MESSAGE))
+	if (gpgme_err_code (err) == GPG_ERR_NO_DATA && (pgp_type & PGP_MESSAGE))
 	    msg_box (hwnd, _("Broken OpenPGP message (maybe: quoted printable "
-			     "character in armor)."),
-                     _("Decryption"), MB_INFO);
+			     "character in armor)."), _("Decryption"), MB_INFO);
 	else
 	    msg_box (hwnd, gpgme_strerror (err), _("Decryption"), MB_ERR);
 	goto leave;
@@ -169,12 +167,15 @@
     if (sigres && sigres->signatures) {
 	gpgme_key_t key=NULL;
 	const char *keyid;
-	const char *uid;
+	char *uid;
 
 	sig = sigres->signatures;
 	if (!sig->fpr)
 	    BUG (NULL);
-	keyid = strlen (sig->fpr) == 40? sig->fpr+24 : sig->fpr+16;
+	if (strlen (sig->fpr) > 16)
+	    keyid = strlen (sig->fpr) == 40? sig->fpr+24 : sig->fpr+16;
+	else
+	    keyid = sig->fpr;
 
 	get_pubkey (keyid, &key);
 	if (key) {
@@ -192,15 +193,15 @@
 	}
 	else
 	    s = "";
-
+	
 	if (key)
-	    uid = key->uids->uid;
+	    uid = utf8_to_wincp2 (key->uids->uid);
 	else
-	    uid = _("user ID not found");
+	    uid = strdup (_("user ID not found"));
 	log_box (_("WinPT Verify"), MB_OK, 
 		 _("%s\n"
 		   "%s\n"
-                   "Signature made %s\n"
+                   "Signature made: %s\n"
                    "From \"%s\" using key ID 0x%s"
 		   "%s %s"),
 		   s, get_gpg_sigstat (sig->summary), 
@@ -208,6 +209,7 @@
 		   uid, keyid+8, 
 		   novalid? "\nPrimary key fingerprint: " : "",
 		   novalid? get_key_fpr (key) : "");
+	safe_free (uid);
     }
     
 leave:

Modified: trunk/Src/wptClipEncryptDlg.cpp
===================================================================
--- trunk/Src/wptClipEncryptDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptClipEncryptDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -147,11 +147,9 @@
 			   kmode, KEY_SORT_USERID);
 	center_window( dlg, NULL );
         SetForegroundWindow( dlg );
-        set_active_window( dlg );
         return TRUE;
         
     case WM_DESTROY:
-        reset_active_window( );
         if( lv ) {
             keylist_delete( lv );
             lv = NULL;

Modified: trunk/Src/wptClipSignDlg.cpp
===================================================================
--- trunk/Src/wptClipSignDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptClipSignDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -155,11 +155,9 @@
 			   KEYLIST_SIGN, KEY_SORT_USERID);
 	center_window (dlg, NULL);
         SetForegroundWindow (dlg);
-        set_active_window (dlg);
         return FALSE;	
         
     case WM_DESTROY:
-        reset_active_window ();
         if (lv) {
             keylist_delete (lv);
             lv = NULL;

Modified: trunk/Src/wptClipSignEncDlg.cpp
===================================================================
--- trunk/Src/wptClipSignEncDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptClipSignEncDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -117,7 +117,6 @@
 			   kc, NULL, kmode, KEY_SORT_USERID);
 	seclist_init (dlg, IDC_SIGNENC_SECLIST, KEYLIST_FLAG_SHORT, &list);
 	center_window (dlg, NULL);
-	set_active_window (dlg);
 	EnableWindow (GetDlgItem (dlg, IDC_SIGNENC_SECLIST), FALSE);
 	SetDlgItemText (dlg, IDC_SIGNENC_SELKEY, _("Select key for signing"));
 	SetDlgItemText (dlg, IDC_SIGNENC_SECLISTINF, _("Signing key:"));
@@ -126,7 +125,6 @@
         
     case WM_DESTROY:
 	seclist_destroy (&list);
-        reset_active_window ();
         if (lv) {
             keylist_delete (lv);
             lv = NULL;

Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptClipVerifyDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -241,11 +241,9 @@
 	    show_notation_data (dlg, sig->notations);
 	gpgme_release (c);
         SetForegroundWindow (dlg);
-        set_active_window (dlg);
         return TRUE;
         
     case WM_DESTROY:
-        reset_active_window ();
         if (lv) {
             listview_release (lv);
             lv = NULL;

Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptFileManager.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -21,6 +21,7 @@
 /* TODO: 
  *    check_armor_type: we should check the whole file and not only the first line! 
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -49,6 +50,7 @@
 #include "wptRegistry.h"
 #include "wptImport.h"
 #include "wptCrypto.h"
+#include "wptKeyManager.h"
 #include "openpgp.h"
 
 #define op_begin()  SetCursor (LoadCursor (NULL, IDC_WAIT))
@@ -1669,25 +1671,6 @@
 }
 
 
-/* Generate a user friendly file name based on the key @k. */
-static char*
-gen_key_outname (gpgme_key_t k)
-{
-    char *p;
-    size_t i;
-
-    p = new char[strlen (k->uids->name)+1+8];
-    if (!p)    
-	BUG (NULL);
-    sprintf (p, "%s.asc", k->uids->name);
-    for (i=0; i < strlen (p); i++) {
-	if (p[i] == ' ')
-	    p[i] = '_';
-    }
-    return p;
-}
-
-
 /* Export the selected keys from the File Manager to a file. */
 int
 fm_export (fm_state_t c)
@@ -1707,7 +1690,7 @@
     }
 
     if (rset[1] == NULL) /* count == 1*/
-	p = gen_key_outname (rset[0]);
+	p = km_gen_export_filename (rset[0]->subkeys->keyid+8, 0);
 
     name = get_filesave_dlg (c->dlg, _("Choose Name for Key File"), 
 			     NULL, p? p : NULL);

Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptFileManagerDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -194,8 +194,6 @@
         c = (fm_state_s *)lparam;
         if (!c)
             dlg_fatal_error( dlg, "Could not get dialog param!" );
-        SetWindowText (dlg, _("Key Import"));
-	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
         ShowWindow (GetDlgItem( dlg, IDC_IMPORT_KEYMNGT ), WS_DISABLED);
         implist_build (&lv, GetDlgItem (dlg, IDC_IMPORT_KEYLIST));
         implist_load (lv, c->opaque, &is_revcert, &has_seckeys);
@@ -213,6 +211,8 @@
 	    SetDlgItemText (dlg, IDC_IMPORT_INFO, p);
 	    free_if_alloc (p);
 	}
+	SetWindowText (dlg, _("Key Import"));
+	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
 	SetForegroundWindow (dlg);
         return TRUE;
         
@@ -272,6 +272,8 @@
         SetDlgItemText (dlg, IDC_FILE_SIG_NORMAL, _("&Normal Signature"));
         SetDlgItemText (dlg, IDC_FILE_SIG_DETACH, _("&Detached Signature"));
         SetDlgItemText (dlg, IDC_FILE_SIG_CLEAR, _("&Cleartext Signature"));
+	SetDlgItemText (dlg, IDC_FILE_SIG_SIGINF, _("Signature mode"));
+	SetDlgItemText (dlg, IDC_FILE_SIG_OPTINF, _("Options"));
 	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
 	CheckDlgButton (dlg, IDC_FILE_SIG_DETACH, BST_CHECKED);
         kc = keycache_get_ctx (KEYCACHE_PUB);
@@ -312,7 +314,7 @@
                 /* default is to produce detached signatures */
                 c->sigmode = GPGME_SIG_MODE_DETACH;
             }
-            lv_idx = listview_get_curr_pos( lv );
+            lv_idx = listview_get_curr_pos (lv);
             if (lv_idx == -1) {
 		if (listview_count_items (lv, 0) == 1)
 		    lv_idx = 0;
@@ -346,7 +348,6 @@
 }
 
 
-
 /* Setup status bar for the main window @dlg. */
 static HWND
 setup_status_bar (HWND dlg)

Modified: trunk/Src/wptGPGMEData.cpp
===================================================================
--- trunk/Src/wptGPGMEData.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptGPGMEData.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -130,7 +130,6 @@
     gpgme_error_t err;
     char line[128+32];
     int pos = 0;
-    int sig_begin = 0;
     
     if (r_plain)
 	*r_plain = NULL;

Modified: trunk/Src/wptGPGUtil.cpp
===================================================================
--- trunk/Src/wptGPGUtil.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptGPGUtil.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -381,6 +381,7 @@
 	*data = map_tmpfile (out);
 	CloseHandle (out);
     }
+
     return err;
 }
 
@@ -480,8 +481,9 @@
     return err;
 }
 
+
 char* 
-generate_revoc_input (int code, const char *cmt, const char *pass)
+generate_revoke_input (int code, const char *cmt, const char *pass)
 {
     const char *fmt;
     char *p;
@@ -512,7 +514,7 @@
    @r_revcert contains the revocation cert on success.
    Return value: 0 on success. */
 gpgme_error_t
-gpg_revoke_key (const char *inp_data, const char *keyid, char **r_revcert)
+gpg_revoke_cert (const char *inp_data, const char *keyid, char **r_revcert)
 {
     gpgme_error_t err = gpg_error (GPG_ERR_NO_ERROR);
     char *rcrt;
@@ -539,6 +541,8 @@
     else {
 	rcrt = map_tmpfile (out);
 	*r_revcert = rcrt;
+	if (rcrt && strlen (rcrt) == 0)
+	    err = gpg_error (GPG_ERR_BAD_PASSPHRASE);
     }
 
     free (p);

Modified: trunk/Src/wptKeyEdit.cpp
===================================================================
--- trunk/Src/wptKeyEdit.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyEdit.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -253,7 +253,7 @@
 gpgme_error_t
 GpgKeyEdit::getDesignatedRevoker (gpg_desig_rev_t *r_rev)
 {
-    gpgme_data_t out=NULL;
+    gpgme_data_t out = NULL;
     gpg_desig_rev_t rev = NULL;
     gpgme_error_t err;
     char buf[256];
@@ -346,6 +346,7 @@
     type = 0;
     name = NULL;
     cmt = NULL;
+    cnt = 0;
     email = NULL;
     cmd_sent = 0;
     resval = 0;
@@ -367,6 +368,8 @@
 GpgKeyEdit::reset (void)
 {
     cmd_sent = 0;
+    cnt = 0;
+    //resval = 0;
 }
 
 
@@ -463,7 +466,6 @@
     return gpg_editkey (this->ctx, this->key, this);
 }
 
-
 /* Set the ownertrust of the key stored in the object
    to the trust value @trust.
    Return value: 0 on success. */
@@ -492,7 +494,7 @@
     this->name = m_strdup (_name);
     free_if_alloc (this->cmt);
     this->cmt = NULL;
-    if (cmt != NULL)
+    if (_cmt != NULL)
 	this->cmt = m_strdup (_cmt);	
     free_if_alloc (this->email);
     this->email = m_strdup (_email);
@@ -580,8 +582,8 @@
    if @exp_days is true, exp_timestamp is already converted to days.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::setKeyExpireDate (int _key_index, 
-			      long exp_timestamp, bool exp_days)
+GpgKeyEdit::setKeyExpireDate (int _key_index, long exp_timestamp, 
+			      bool exp_days)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
@@ -709,7 +711,6 @@
 	return gpg_error (GPG_ERR_INV_OBJ);
     type = GPG_EDITKEY_CLEAN;
     return gpg_editkey (this->ctx, this->key, this);
-    
 }
 
 

Modified: trunk/Src/wptKeyEditCB.cpp
===================================================================
--- trunk/Src/wptKeyEditCB.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyEditCB.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -35,6 +35,11 @@
 #include "wptKeyEdit.h"
 #include "wptErrors.h"
 
+/* Possible errors for the edit key operation. */
+enum editkey_error_t {
+    EDITKEY_ERR_ALREADY_SIGNED = 1,
+    EDITKEY_ERR_BAD_PASSPHRASE = 2
+};
 
 /* 'keyserver' command handler. */
 static const char*
@@ -274,15 +279,15 @@
     if (!strcmp (key, "passphrase.enter"))
 	return ctx->pass;
     if (!strcmp (key, "keygen.algo")) {
-        _snprintf (buf, sizeof buf-1, "%d", ctx->pubkey_algo);
+        _snprintf (buf, sizeof (buf)-1, "%d", ctx->pubkey_algo);
 	return buf;
     }   
     if (!strcmp (key, "keygen.size")) {
-        _snprintf (buf, sizeof buf-1, "%d", ctx->pubkey_size);
+        _snprintf (buf, sizeof (buf)-1, "%d", ctx->pubkey_size);
 	return buf;
     }
     if (!strcmp (key, "keygen.valid")) {
-        _snprintf (buf, sizeof buf-1, "%d", ctx->valid);
+        _snprintf (buf, sizeof (buf)-1, "%d", ctx->valid);
 	return buf;        
     }
     if (!strcmp (key, "keyedit.prompt")) {
@@ -300,18 +305,19 @@
 	ctx->cmd_sent = 1;
 	return "passwd";
     }
-    if( !strcmp (key, "passphrase.enter") && !ctx->cnt) {
+    if (!ctx->cnt && !strcmp (key, "passphrase.enter")) {
         ctx->cnt = 1;
 	return ctx->pass;
     }
-    if( !strcmp (key, "passphrase.enter" ))
+    if (!strcmp (key, "passphrase.enter" ))
         return ctx->new_pass;
-    if( !strcmp (key, "change_passwd.empty.okay" ))
+    if (!strcmp (key, "change_passwd.empty.okay" ))
 	return ctx->flags?  "Y" : "N";
     if (!strcmp (key, "keyedit.prompt")) {
 	ctx->reset ();
         return "save";
     }
+
     return NULL;
 } 
 
@@ -319,9 +325,10 @@
 static const char*
 cmd_setpref_handler (GpgKeyEdit *ctx, gpgme_status_code_t code, const char * key)
 {
+    static char buf[128];
+
     /* XXX: check the code. */
 #if 0
-    static char buf[128];
     if (!ctx->cmd_sent && !strcmp (key, "keyedit.prompt")) {
 	ctx->cmd_sent = 1;
 	return "";
@@ -566,7 +573,7 @@
 
     /* If the isuser already signed the key, send an empty
 	   string and jump to quit. */
-    if (ctx->getResult () & GPG_EDITRES_ALREADY_SIGNED 
+    if (ctx->getResult () & EDITKEY_ERR_ALREADY_SIGNED 
 	&& *r_step != -1 && *r_step != 4) {
 	*r_step = step = -1;
 	return "";
@@ -663,7 +670,7 @@
 editkey_command_handler (void *opaque, gpgme_status_code_t code, 
 			 const char *key, int fd)
 {
-    static int step = 0;
+    static int step = 0; /* XXX use ke->cnt */
     const char *out = NULL;
     GpgKeyEdit *ke = (GpgKeyEdit *)opaque;
     HANDLE hd = (HANDLE)fd;
@@ -675,24 +682,27 @@
     /*log_debug ("key=%s code=%d\r\n", key, code);*/
     switch (code) {
     case GPGME_STATUS_ALREADY_SIGNED:
-	ke->setResult (GPG_EDITRES_ALREADY_SIGNED);
+	ke->setResult (EDITKEY_ERR_ALREADY_SIGNED);
 	break;
 
     case GPGME_STATUS_BAD_PASSPHRASE:
-	ke->setResult (GPG_EDITRES_BAD_PASSPHRASE);
+	ke->setResult (EDITKEY_ERR_BAD_PASSPHRASE);
 	break;
 
     default:
 	break;
     }
 
-    if (ke->getResult () & GPG_EDITRES_BAD_PASSPHRASE) {
+    if (ke->getResult () & EDITKEY_ERR_BAD_PASSPHRASE) {
 	/* If the entered passphrase is bad, we supply empty
 	   passphrase to abort and send 'quit' as soon as possible. */
 	if (!strcmp (key, "passphrase.enter"))
 	    WriteFile (hd, "\n", 1, &n, NULL);
 	if (!strcmp (key, "keyedit.prompt"))
 	    WriteFile (hd, "quit\n", 5, &n, NULL);
+	ke->reset ();
+	step = 0;
+	return 0;
     }
     
     switch (ke->getType ()) {
@@ -797,7 +807,7 @@
     /* XXX Sometimes ALREADY_SIGNED indicates an failure. */
     if (!ke->getResult ())
 	return gpg_error (GPG_ERR_NO_ERROR);
-    if (ke->getResult () & GPG_EDITRES_BAD_PASSPHRASE)
+    if (ke->getResult () & EDITKEY_ERR_BAD_PASSPHRASE)
 	return gpg_error (GPG_ERR_BAD_PASSPHRASE);
     return 0;
 }

Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyEditDlgs.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -138,7 +138,7 @@
 	    continue;
 	s = key->uids->uid;
 	kid = key->subkeys->keyid;
-	if (!s || !strcmp (kid+8, k->keyid+2))
+	if (!s || !strcmp (kid+8, k->keyid))
 	    continue;
 	u = utf8_to_wincp (s, strlen (s));
 	SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_ADDSTRING, 
@@ -181,7 +181,7 @@
     listview_add_sub_item (lv, 0, 2, email && *email? email : "");
     listview_add_sub_item (lv, 0, 3, get_key_created (time (NULL)));
     free_if_alloc (p);
-} /* do_add_new_userid */
+}
 
 
 static void
@@ -366,23 +366,23 @@
 keyedit_addrevoker_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
     static winpt_key_t k;
-    static gpgme_key_t seckey;    
+    static gpgme_key_t seckey;
+    gpgme_error_t err;
     GpgKeyEdit *ke;
-    gpgme_error_t err;
     char uid[128], pwd[128];
-    
 
-    switch( msg ) {
+    switch (msg) {
     case WM_INITDIALOG:
 	k = (winpt_key_t)lparam;
-	if( !k )
-	    BUG( NULL );
-	if( get_seckey( k->keyid, &seckey ) )	
-	    BUG( NULL );
+	if (!k)
+	    BUG (NULL);
+	if (get_seckey (k->keyid, &seckey))
+	    BUG (NULL);
 	if (!k->is_protected)
 	    EnableWindow (GetDlgItem (dlg, IDC_ADDREV_PASS), FALSE);
 	do_init_keylist (dlg, k);
-	SetDlgItemText (dlg, IDC_ADDREV_INF, _("Appointing a key as designated revoker cannot be undone."));
+	SetDlgItemText (dlg, IDC_ADDREV_INF, 
+			_("Appointing a key as designated revoker cannot be undone."));
 	SetDlgItemText (dlg, IDC_ADDREV_KEYINF, _("Public key"));
 	SetDlgItemText (dlg, IDC_ADDREV_PWDINF, _("Passphrase"));
 	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
@@ -417,20 +417,21 @@
 		ke->setPassphrase (pwd);
 	    err = ke->addDesignatedRevoker (uid);
 	    delete ke;
-	    memset (pwd, 0, sizeof pwd);
+	    wipememory (pwd, sizeof (pwd));
 	    if (err) {
 		msg_box (dlg, gpgme_strerror (err), _("Add Revoker"), MB_ERR);
 		return TRUE;
 	    }
 	    else {
 		k->update = 1;
-		msg_box (dlg, _("Revoker successfully addded."), _("GnuPG Status"), MB_OK);
+		msg_box (dlg, _("Revoker successfully addded."), 
+			 _("GnuPG Status"), MB_OK);
 	    }
-	    EndDialog( dlg, TRUE );
+	    EndDialog (dlg, TRUE);
 	    break;
 
 	case IDCANCEL:
-	    EndDialog( dlg, FALSE );
+	    EndDialog (dlg, FALSE);
 	    break;
 	}
 	break;
@@ -572,6 +573,7 @@
 }
 
 
+/* Dialog procedure for adding a new secondary key. */
 BOOL CALLBACK
 keyedit_addsubkey_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
@@ -676,18 +678,18 @@
 		ctx->finished = 1;
 	    }
 	    delete ke;
-            EndDialog (dlg, TRUE);
+	    EndDialog (dlg, TRUE);
             return TRUE;
             
         case IDCANCEL:
-            EndDialog( dlg, FALSE );
+            EndDialog (dlg, FALSE);
             return FALSE;
         }
         break;
     }
     
     return FALSE;
-} /* keyedit_addsubkey_dlg_proc */
+}
 
 
 BOOL
@@ -849,14 +851,14 @@
 BOOL
 keyedit_add_revoker (winpt_key_t k, HWND dlg)
 {
-    if( !k->key_pair ) {
-	msg_box( dlg, _("There is no secret key available!"), _("Add Revoker"), MB_ERR );
+    if (!k->key_pair) {
+	msg_box (dlg, _("There is no secret key available!"), _("Add Revoker"), MB_ERR);
         return FALSE;
     }
     DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT_ADDREV, dlg,
 		    keyedit_addrevoker_dlg_proc, (LPARAM)k);
     return TRUE;
-} /* keyedit_add_revoker */
+}
 
 
 static int
@@ -882,11 +884,12 @@
 
 
 BOOL
-keyedit_change_passwd( winpt_key_t k, HWND dlg )
+keyedit_change_passwd (winpt_key_t k, HWND dlg)
 {
+    gpgme_error_t ec;
     GpgKeyEdit *ke;
-    gpgme_error_t ec;    
-    char *old_pass = NULL, *new_pass = NULL;
+    char *old_pass = NULL;
+    char *new_pass = NULL;
     int cancel = 0;
 
     if( !k->key_pair ) {
@@ -901,23 +904,23 @@
 	return FALSE;
     }
 
-    if( k->is_protected ) {
-	old_pass = request_passphrase( _("Current (old) Passphrase"), 1, &cancel );
+    if (k->is_protected) {
+	old_pass = request_passphrase (_("Current (old) Passphrase"), 1, &cancel);
 	if (cancel)
 	    return FALSE;
     }
-    new_pass = request_passphrase( _("New Passphrase" ), 1, &cancel );
-    if( cancel ) {
-	free_if_alloc( old_pass );
+    new_pass = request_passphrase2 (_("New Passphrase" ), 1, &cancel);
+    if (cancel) {
+	free_if_alloc (old_pass);
         return FALSE;
     }
 
-    if( is_8bit_string( new_pass ) ) {
-	msg_box( dlg, _("The passphrase contains 8-bit characters.\n"
+    if (is_8bit_string (new_pass)) {
+	msg_box (dlg, _("The passphrase contains 8-bit characters.\n"
 		         "It is not suggested to use charset specific characters."),
-			 _("Key Edit"), MB_ERR );
-	free_if_alloc( old_pass );
-	free_if_alloc( new_pass );
+			 _("Key Edit"), MB_ERR);
+	free_if_alloc (old_pass);
+	free_if_alloc (new_pass);
 	return FALSE;
     }
 
@@ -1057,8 +1060,8 @@
     };    
     const char *attr;
 
-    if (get_pubkey( k->keyid, &key)) {
-	msg_box( dlg, _("Could not find key."), _("Key Edit"), MB_ERR );
+    if (get_pubkey (k->keyid, &key)) {
+	msg_box (dlg, _("Could not find key."), _("Key Edit"), MB_ERR);
 	return NULL;
     }
     
@@ -1069,8 +1072,8 @@
     }
         
     rc = listview_new (&lv);
-    if( rc )
-	BUG( dlg );        
+    if (rc)
+	BUG (dlg);
     lv->ctrl = GetDlgItem( dlg, IDC_KEYEDIT_UIDLIST );
     for( j = 0; cols[j].fieldname != NULL; j++ )
         listview_add_column( lv, &cols[j] );
@@ -1093,7 +1096,7 @@
 	/* XXX: add comment if available */
 	attr = u->name;
 	if (attr) {
-	    char * uid = utf8_to_wincp (attr, strlen (attr));
+	    char *uid = utf8_to_wincp (attr, strlen (attr));
 	    if (uid) {
 		listview_add_sub_item( lv, j, 1, uid );
 		free( uid );
@@ -1105,7 +1108,7 @@
 	if (attr)
 	    listview_add_sub_item (lv, j, 2, attr);
 
-	ks = get_selfsig (u, k->keyid+2, 1);
+	ks = get_selfsig (u, k->keyid, 1);
 	if (ks)
 	    listview_add_sub_item (lv, j, 3, get_key_created (ks->timestamp));
     }

Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyManager.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -47,6 +47,7 @@
 #include "wptKeyEdit.h"
 #include "wptImport.h"
 #include "wptCrypto.h"
+#include "wptUTF8.h"
 
 
 /* Return a user friendly key representation in @buf of
@@ -55,9 +56,11 @@
 key_get_clip_info (const char *keyid, char *buf, size_t buflen)
 {
     gpgme_key_t pk;
+    char *uid;
 
     if (get_pubkey (keyid, &pk))
 	BUG (NULL);
+    uid = utf8_to_wincp2 (pk->uids->uid);
     _snprintf (buf, buflen-1, 
 	       "pub %04d%s/%s %s %s\r\n"
 	       "    Primary key fingerprint: %s\r\n",
@@ -65,8 +68,9 @@
 	       get_key_pubalgo2 (pk->subkeys->pubkey_algo),
 	       pk->subkeys->keyid+8,
 	       get_key_created (pk->subkeys->timestamp),
-	       pk->uids->uid,
+	       uid,
 	       get_key_fpr (pk));
+    safe_free (uid);
 }
 
 
@@ -75,18 +79,20 @@
 key_get_info (gpgme_key_t pk, int is_sec)
 {
     const char *fmt = "%s %04d%s/0x%s %s\n  \"%s\"";
-    char *p;
+    char *p, *uid;
     int n;
 
     n = strlen (fmt) + 8 + 2 + 16 + 12 + strlen (pk->uids->uid) + 32;
     p = new char[n+1];
     if (!p)
 	BUG (NULL);
+    uid = utf8_to_wincp2 (pk->uids->uid);
     _snprintf (p, n, fmt, is_sec? "sec" : "pub",
 	       pk->subkeys->length,
 	       get_key_pubalgo2 (pk->subkeys->pubkey_algo),
 	       pk->subkeys->keyid+8, get_key_created (pk->subkeys->timestamp),
-	       pk->uids->uid);
+	       uid);
+    safe_free (uid);
     return p;
 }
 
@@ -356,8 +362,9 @@
 }
 
 
+/* Export the selected recipients from @lv into the file @fname. */
 int
-km_file_export (HWND dlg, listview_ctrl_t lv, const char * fname)
+km_file_export (HWND dlg, listview_ctrl_t lv, const char *fname)
 {
     gpgme_key_t *rset;
     gpgme_data_t keydata;	
@@ -734,6 +741,7 @@
     gpgme_error_t rc;
     char tmp[128];
     char *fname;
+    char *name;
     int pos;
 
     if (listview_count_items (lv, 1) > 1) {
@@ -753,7 +761,8 @@
     GetTempPath (sizeof (tmp)-1, tmp);
     if (tmp[strlen (tmp)-1] == '\\')
 	tmp[strlen (tmp)-1] = 0;
-    fname = make_filename (tmp, key->uids->name, "asc");
+    name = utf8_to_wincp2 (key->uids->name); 
+    fname = make_filename (tmp, name, "asc");
     for (pos=0; pos < (int)strlen (fname); pos++) {
 	if (fname[pos] == ' ')
 	    fname[pos] = '_';
@@ -775,6 +784,7 @@
 
     gpg_data_release_and_set_file (out, fname);
     gpgme_release (ctx);
+    safe_free (name);
     free_if_alloc (fname);
     return rc;
 }
@@ -834,7 +844,7 @@
 {    
     char buf[256];
     
-    key_get_clip_info (uid, buf, 255);    
+    key_get_clip_info (uid, buf, sizeof (buf)-1);
     set_clip_text (NULL, buf, strlen (buf));
 }
 
@@ -857,48 +867,6 @@
 }
 
 
-/* Update the default key entry in the status bar for dialog @dlg. */
-void
-km_update_default_key_str (HWND dlg)
-{
-    char *keyid, defkeyinf[512];
-    const char *fmt;
-    
-    /* XXX: also show the name? */
-    keyid = get_gnupg_default_key ();
-    if (!keyid)
-	return;
-    if( (keyid[0] >= 'A' && keyid[0] <= 'Z') || (keyid[0] >= 'a' && keyid[0] <= 'z')
-	|| (keyid[0] == '0' && keyid[1] == 'x') )
-        fmt = _("Default Key: %s");
-    else
-        fmt = _("Default Key: 0x%s");
-    _snprintf (defkeyinf, sizeof defkeyinf - 1, fmt, keyid);
-    SendMessage (dlg, SB_SETTEXT, 0, (LPARAM)defkeyinf);
-    free_if_alloc (keyid);
-}
-
-
-/* Count all keys and show from @lv results in the status bar @sb. */
-void
-km_update_status_bar (HWND sb, listview_ctrl_t lv)
-{
-    char txt_sec[128], txt_pub[128];
-    int nkeys = 0, nsec = 0;
-    int i;
-
-    nkeys = listview_count_items (lv, 0);
-    for (i = 0; i < nkeys; i++) {
-	if (km_check_for_seckey (lv, i, NULL))
-	    nsec++;
-    }
-    _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
-    _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
-    SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
-    SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt_pub);
-}
-
-
 /* Set trust of selected key in @lv (at @pos) to ultimate. */
 int
 km_set_implicit_trust (HWND dlg, listview_ctrl_t lv, int pos)
@@ -951,3 +919,29 @@
     }
     free_if_alloc (name);
 }
+
+
+/* Return a user-friendly name for a key derrived from
+   name. If @is_secret is 1, a secret key name will be generated. */
+char*
+km_gen_export_filename (const char *keyid, int is_secret)
+{
+    gpgme_key_t key;
+    char *p, *uid;
+
+    if (get_pubkey (keyid, &key))
+	return m_strdup (keyid);
+    uid = utf8_to_wincp2 (key->uids->name);
+    if (!uid)
+	return m_strdup (keyid);
+    p = new char[strlen (uid) + 8 + 16];
+    if (!p)
+	BUG (0);
+    sprintf (p, "%s%s.asc", uid, is_secret? "_sec" : "");
+    for (size_t i=0; i < strlen (p); i++) {
+	if (p[i] == ' ' || p[i] == ':' || p[i] == '?' || p[i] == '|')
+	    p[i] = '_';
+    }
+    safe_free (uid);
+    return p;
+}

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyManagerDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -41,10 +41,11 @@
 #include "wptKeyserver.h"
 #include "wptKeyEdit.h"
 #include "wptRegistry.h"
+#include "wptUTF8.h"
 
 /* Name and ID of the separator window. */
-#define KM_SEPARATOR_ID		       10000
-#define WINDOWCLASS_SEPARATOR_CHILD "WINPT_SEP_CHILD"
+#define KM_SEPARATOR_ID			10000
+#define WINDOWCLASS_SEPARATOR_CHILD	"WINPT_SEP_CHILD"
 
 /* Virtual key codes. */
 #ifndef VK_F
@@ -64,7 +65,7 @@
 
 HIMAGELIST glob_imagelist;
 
-struct km_info {
+struct km_info_s {
     /* Window positions */
     int pos_x, pos_y;
     int ypos_sep;
@@ -155,7 +156,7 @@
 
 
 static HWND
-load_toolbar (HWND dlg, struct km_info *kmi)
+load_toolbar (HWND dlg, struct km_info_s *kmi)
 {
     HWND tbwnd;
     TBSAVEPARAMS tbsp;
@@ -193,7 +194,7 @@
 /* Restore the width of the columns from the registry.
    If no bitstring was found, the default size is used. */
 int
-restore_column_size (listview_ctrl_t hd)
+restore_column_info (listview_ctrl_t hd)
 {
     WORD *buf;
     HKEY root;
@@ -219,7 +220,7 @@
 
     /* check for garbled values. */
     for (i=0; i < size/2; i++) {
-	if (buf[i] > 512) {
+	if (buf[i] == 0 || buf[i] > 512) {
 	    free_if_alloc (buf);
 	    return -1;
 	}
@@ -239,7 +240,7 @@
 
 /* Save the current column width to the registry. */
 int
-save_column_size (listview_ctrl_t hd)
+save_column_info (listview_ctrl_t hd)
 {
     WORD *buf;
     HKEY root;
@@ -275,7 +276,7 @@
 
 /* Center window @dlg. */
 static void
-do_center_window (HWND dlg, struct km_info *kmi)
+do_center_window (HWND dlg, struct km_info_s *kmi)
 {
     RECT rect;
     char *p;
@@ -324,7 +325,7 @@
 
 /* Resize the key manager window with the information from @kmi. */
 static void
-do_resize_window (HWND dlg, struct km_info *kmi)
+do_resize_window (HWND dlg, struct km_info_s *kmi)
 {
     HWND h;
     RECT rclient, rect;
@@ -438,6 +439,51 @@
 }
 
 
+/* Update the default key entry in the status bar for dialog @dlg. */
+void
+update_default_key_str (HWND dlg)
+{
+    const char *fmt;
+    char *keyid;
+    char defkeyinf[128];
+    
+    /* XXX: also show the name? */
+    keyid = get_gnupg_default_key ();
+    if (!keyid)
+	return;
+    if ((keyid[0] >= 'A' && keyid[0] <= 'Z') || 
+	(keyid[0] >= 'a' && keyid[0] <= 'z') ||
+	(keyid[0] == '0' && keyid[1] == 'x'))
+        fmt = _("Default Key: %s");
+    else
+        fmt = _("Default Key: 0x%s");
+    _snprintf (defkeyinf, sizeof (defkeyinf) - 1, fmt, keyid);
+    SendMessage (dlg, SB_SETTEXT, 0, (LPARAM)defkeyinf);
+    free_if_alloc (keyid);
+}
+
+
+/* Count all keys and show from @lv results in the status bar @sb. */
+void
+update_status_bar (HWND sb, listview_ctrl_t lv)
+{
+    char txt_sec[128], txt_pub[128];
+    int nkeys = 0, nsec = 0;
+    int i;
+
+    nkeys = listview_count_items (lv, 0);
+    for (i = 0; i < nkeys; i++) {
+	if (km_check_for_seckey (lv, i, NULL))
+	    nsec++;
+    }
+    _snprintf (txt_sec, sizeof (txt_sec)-1, _("%d secret keys"), nsec);
+    _snprintf (txt_pub, sizeof (txt_pub)-1, _("%d keys"), nkeys);
+    SendMessage (sb, SB_SETTEXT, 1, (LPARAM)txt_sec);
+    SendMessage (sb, SB_SETTEXT, 2, (LPARAM)txt_pub);
+}
+
+
+
 /* Reload the key cache if requested. */
 static void
 do_check_cache (listview_ctrl_t lv, HWND dlg, HWND sb)
@@ -451,7 +497,7 @@
 	if (!cache)
 	    BUG (dlg);
 	keylist_reload (lv, cache, KEYLIST_LIST, KEY_SORT_USERID);
-	km_update_status_bar (sb, lv);
+	update_status_bar (sb, lv);
     }
 }
 
@@ -520,11 +566,11 @@
 
     case WM_MOUSEMOVE:
         if (wparam == MK_LBUTTON) {
-            struct km_info *kmi;
+            struct km_info_s *kmi;
             POINT p;
             RECT r;
 
-	    kmi = (struct km_info *)GetWindowLong (hwnd, GWL_USERDATA);
+	    kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
             if (kmi == NULL)
                 break;
 
@@ -555,7 +601,7 @@
 
 /* Register the separator window with @dlg as the parent window. */
 static HWND
-regist_sep_wnd (HWND dlg, struct km_info * kmi)
+regist_sep_wnd (HWND dlg, struct km_info_s *kmi)
 {
     WNDCLASS wndclass;
     HWND h;
@@ -622,13 +668,16 @@
     state = key_selected? MF_ENABLED : MF_DISABLED|MF_GRAYED;
     hmenu = GetMenu (hwnd);
     set_menu_state (hmenu, ID_KEYMISC_EXPORT, state);
-    set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY, state);
-    set_menu_state (hmenu, ID_KEYMISC_REVCERT, state);
     set_menu_state (hmenu, ID_KEYMISC_DELETE, state);
     set_menu_state (hmenu, ID_KEYMISC_PROPS, state);
     set_menu_state (hmenu, ID_KEYMISC_EDITKEY, state);
     set_menu_state (hmenu, ID_KEYMISC_CHECKSIGS, state);
-    set_menu_state (hmenu, ID_KEYMISC_SIGN, key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
+    set_menu_state (hmenu, ID_KEYMISC_SIGN, 
+		    key_selected && !key_inv ? MF_ENABLED : MF_GRAYED);
+    set_menu_state (hmenu, ID_KEYMISC_EXPORT_PRIVKEY, 
+		    key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
+    set_menu_state (hmenu, ID_KEYMISC_REVCERT, 
+		    key_selected && key_has_sec? MF_ENABLED : MF_GRAYED);
 
     /* Disable some menu items when multiple keys are selected. */
     if (listview_count_items (lv, 1) > 1) {
@@ -753,32 +802,6 @@
 }
 
 
-/* Return a user-friendly name for a key derrived from
-   name. If @is_secret is 1, a secret key name will be generated. */
-static char*
-gen_export_filename (const char *keyid, int is_secret)
-{
-    gpgme_key_t key;
-    const char *s;
-    char *p;
-
-    if (get_pubkey (keyid, &key))
-	return m_strdup (keyid);
-    s = key->uids->name;
-    if (!s)
-	return m_strdup (keyid);
-    p = new char[strlen (s) + 8 + 16];
-    if (!p)
-	BUG (0);
-    sprintf (p, "%s%s.asc", s, is_secret? "_sec" : "");
-    for (size_t i=0; i < strlen (p); i++) {
-	if (p[i] == ' ' || p[i] == ':' || p[i] == '?' || p[i] == '|')
-	    p[i] = '_';
-    }
-    return p;
-}
-
-
 /* Reload a single key in the cache. */
 static void
 update_key (listview_ctrl_t lv, int pos, const char *keyid, int keypair)
@@ -814,13 +837,54 @@
     ShowWindow (statbar, SW_SHOW);
     SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
 
-    km_update_default_key_str (statbar);
-    km_update_status_bar (statbar, lv);
+    update_default_key_str (statbar);
+    update_status_bar (statbar, lv);
 
     return statbar;
 }
 
 
+/* Remove or add columns which depends on the state of @checked. */
+void
+modify_listview_columns (km_info_s *kmi, UINT m_uid, BOOL checked)
+{
+    UINT resids[] = {
+	0,
+	ID_KEYMISC_VIEWKEYID,
+	ID_KEYMISC_VIEWTYPE,
+	0,
+	ID_KEYMISC_VIEWCIPHER,
+	0,
+	0,
+	ID_KEYMISC_VIEWCREAT,
+	-1
+    };
+    listview_column_s cols[] = {
+    {0, 240, (char *)_("User ID")},
+    {1, 78, (char *)_("Key ID")},
+    {2, 52, (char *)_("Type")},    
+    {3, 66, (char *)_("Size")},
+    {4, 60, (char *)_("Cipher")},
+    {5, 66, (char *)_("Validity")},
+    {6, 58, (char *)_("Trust")},
+    {7, 72, (char *)_("Creation")},
+    {0, 0, NULL}
+    };
+    UINT pos;
+
+    for (pos=0; resids[pos] != -1; pos++) {
+	if (m_uid == resids[pos])
+	    break;
+    }
+    if (!checked)
+	listview_del_column (kmi->lv, (int)pos);
+    else {	
+	listview_add_column (kmi->lv, &cols[pos]);
+	keylist_upd_col (kmi->lv, pos);
+    }
+}
+
+
 /* Translate all menu strings. */
 static void
 translate_menu_strings (HWND dlg)
@@ -849,7 +913,7 @@
     set_menu_text (menu, ID_KEYMISC_SIGN, _("&Sign"));
     set_menu_text (menu, ID_KEYMISC_DELETE, _("&Delete"));
     set_menu_text (menu, ID_KEYMISC_DELETE2, _("&Delete"));
-    set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke"));
+    set_menu_text (menu, ID_KEYMISC_REVCERT, _("&Revoke Cert"));
     set_menu_text (menu, ID_KEYMISC_CHECKSIGS, _("&List Signatures"));
     set_menu_text (menu, ID_KEYMISC_TRUSTPATH, _("List Trust Path"));
     set_menu_text (menu, ID_KEYMISC_EXPORT, _("&Export..."));
@@ -865,6 +929,11 @@
     set_menu_text (menu, ID_KEYMISC_INFO, _("Info") );
     set_menu_text (menu, ID_KEYMISC_HELP, _("&Help"));
 
+    set_menu_text (menu, ID_KEYMISC_VIEWKEYID, _("Key ID"));
+    set_menu_text (menu, ID_KEYMISC_VIEWCIPHER, _("Cipher"));
+    set_menu_text (menu, ID_KEYMISC_VIEWTYPE, _("Type"));
+    set_menu_text (menu, ID_KEYMISC_VIEWCREAT, _("Creation"));
+
     /* XXX: implement help code. */
     set_menu_state (menu, ID_KEYMISC_HELP, MF_GRAYED);
 
@@ -888,7 +957,7 @@
     set_menu_text (popup, ID_KEYCTX_PROPS, _("&Properties"));
     set_menu_text (popup, ID_KEYCTX_EDIT, _("Key Edit"));
     set_menu_text (popup, ID_KEYCTX_DEL, _("&Delete"));
-    set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke"));
+    set_menu_text (popup, ID_KEYCTX_REV, _("&Revoke Cert"));
     set_menu_text (popup, ID_KEYCTX_SIGN, _("&Sign"));
     set_menu_text (popup, ID_KEYCTX_ENABLE, _("&Enable"));
     set_menu_text (popup, ID_KEYCTX_DISABLE, _("&Disable"));
@@ -913,7 +982,7 @@
 BOOL CALLBACK
 keymanager_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {
-    struct km_info *kmi;
+    struct km_info_s *kmi;
     static int refresh_keys = 0;    
     INITCOMMONCONTROLSEX icex;
     HWND kl;
@@ -924,19 +993,19 @@
     struct winpt_key_s k = {0};
     struct URL_ctx_s *url;
     refresh_cache_s rcs = {0};
-    char keyid[48], uid[128], type[32], *name;
+    char type[32], *name;
     const char *t, *host;
-    u16 port = 0;
+    WORD port = 0;
     int l_idx = 0, i=0, rc;
 
     if ((msg != WM_INITDIALOG) 
-	&& ((kmi = (struct km_info*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
+	&& ((kmi = (struct km_info_s*)GetWindowLong (dlg, GWL_USERDATA)) == NULL))
         return FALSE;
 
     switch (msg) {
     case WM_INITDIALOG:
-        kmi = new struct km_info;
-        memset (kmi, 0, sizeof (struct km_info));
+        kmi = new struct km_info_s;
+        memset (kmi, 0, sizeof (struct km_info_s));
 	kmi->lv_idx = -1;
         icex.dwSize = sizeof (INITCOMMONCONTROLSEX);
         icex.dwICC  = ICC_BAR_CLASSES;
@@ -961,7 +1030,7 @@
         /* init subclassing for the listview */
         keylist_proc.dlg = dlg;
         keylist_proc.current = (WNDPROC)keylist_subclass_proc;
-        keylist_proc.old = (WNDPROC)GetWindowLong( kl, GWL_WNDPROC );
+        keylist_proc.old = (WNDPROC)GetWindowLong(kl, GWL_WNDPROC);
         if (keylist_proc.old) {
             if( !SetWindowLong (kl, GWL_WNDPROC, (LONG)keylist_proc.current)) {
                 msg_box (dlg, _("Could not set keylist window procedure."), 
@@ -976,16 +1045,17 @@
 	do_center_window (dlg, kmi);
         do_resize_window (dlg, kmi);
         update_ui_items (dlg, kmi->lv);
-	restore_column_size (kmi->lv);
+	restore_column_info (kmi->lv);
 
 	SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
 	SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst, 
 		      (LPCTSTR)IDI_WINPT));
 	SetForegroundWindow (dlg);
+	force_foreground_window (dlg, 1000);
         return TRUE;
         
     case WM_DESTROY:
-	save_column_size (kmi->lv);
+	save_column_info (kmi->lv);
 	if (kmi->lv) {
             keylist_delete (kmi->lv);
             kmi->lv = NULL;       
@@ -1241,7 +1311,7 @@
         case ID_KEYMISC_DELETE:
 	case ID_KEYMISC_DELETE2:
             if (!km_delete_keys (kmi->lv, dlg))
-		km_update_status_bar (kmi->statbar, kmi->lv);
+		update_status_bar (kmi->statbar, kmi->lv);
             return TRUE;
             
         case ID_KEYMISC_SIGN:
@@ -1268,9 +1338,10 @@
                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                 return TRUE;
             }
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1);
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid-1);
-            if ( !km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
+            if (!km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
                 msg_box (dlg, _("There is no secret key available!"), 
 			_("Key Manager"), MB_ERR);
                 return TRUE;
@@ -1280,7 +1351,7 @@
                 char state[64];
                 listview_get_item_text (kmi->lv, kmi->lv_idx, 5, 
 					state, sizeof (state) -1);
-                if( strchr (state, 'R' )) {
+                if (strchr (state, 'R' )) {
                     msg_box (dlg, _("Key already revoked!"), 
 			     _("Key Manager"), MB_INFO);
                     return TRUE;
@@ -1289,11 +1360,11 @@
             
 	    memset (&k, 0, sizeof (k));
             k.key_pair = 1;
-            k.keyid = keyid;
+            k.keyid = key->subkeys->keyid+8;
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
             dialog_box_param(glob_hinst, (LPCSTR)IDD_WINPT_KEYREVOKE, dlg,
                              key_revoke_dlg_proc, (LPARAM)&k,
-                             _("Key Revocation"), IDS_WINPT_KEYREVOKE);
+                             _("Key Revocation Cert"), IDS_WINPT_KEYREVOKE);
             return TRUE;
             
         case ID_KEYMISC_TRUSTPATH:
@@ -1301,18 +1372,18 @@
                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                 return TRUE;
             }
-            listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid -1 );
-            listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof keyid -1 );
-            if( km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL ) ) {
-                msg_box( dlg, _("It does not make any sense with a key pair!"), _("Key Manager"), MB_OK );
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+            if (km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)) {
+                msg_box (dlg, _("It does not make any sense with a key pair!"), 
+			 _("Key Manager"), MB_ERR);
                 return TRUE;
             }
 	    memset (&k, 0, sizeof (k));
-            k.keyid = keyid;
-            k.uid = uid;
-            dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg, 
+            k.keyid = key->subkeys->keyid+8;
+            k.uid = key->uids->uid;
+            dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYTRUST, dlg, 
                               keytrust_dlg_proc, (LPARAM)&k, 
-                              _("List Trust Path"), IDS_WINPT_KEYTRUST );
+                              _("List Trust Path"), IDS_WINPT_KEYTRUST);
             return TRUE;
             
         case ID_KEYMISC_CHECKSIGS:	    
@@ -1320,11 +1391,12 @@
                 msg_box (dlg, _("Please select a key."), _("Key Manager"), MB_ERR);
                 return TRUE;
             }
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 0, uid, DIM (uid)-1);
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
-            k.keyid = keyid;
-            k.uid = uid;
+            k.keyid = key->subkeys->keyid+8;
+            k.uid = key->uids->uid;
 	    k.ctx = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
             dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYSIG, dlg, 
                               keysig_dlg_proc, (LPARAM)&k,
@@ -1336,13 +1408,12 @@
                 msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
                 return TRUE;
             }
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 2, type, DIM (type)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
-            k.key_pair = 0;
-            k.keyid = keyid;
-            if( !strcmp( type, "pub/sec" ) || !strcmp( type, "pub/crd" ) )
-                k.key_pair = 1;
+            k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL)? 1 : 0;
+            k.keyid = key->subkeys->keyid+8;
 	    k.callback.ctl = kmi->lv;
 	    k.callback.idx = kmi->lv_idx;
 	    k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
@@ -1356,7 +1427,8 @@
             return TRUE;
             
         case ID_KEYMISC_RECACHE:
-            /* If there is already a reload request, don't bother the user with a message. */
+            /* If there is already a reload request, 
+		don't bother the user with a message. */
             if (keycache_get_reload() == 1)
                 l_idx = IDYES;
             else {
@@ -1439,19 +1511,20 @@
             return TRUE;
             
         case ID_KEYMISC_GPGPREFS:
-            dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
-                              gpgprefs_dlg_proc, 0, _("GnuPG Preferences"), 
-			      IDS_WINPT_GPGPREFS );
+            dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGPREFS, dlg,
+                              gpgprefs_dlg_proc, 0, _("GnuPG Preferences"),
+			      IDS_WINPT_GPGPREFS);
             return TRUE;
             
         case ID_KEYMISC_GPGOPT:
-            dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,
-                              gpgopt_dlg_proc, 0, _("GnuPG Options" ), 
-			      IDS_WINPT_GPGOPT );
+            dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_GPGOPT, dlg,
+                              gpgopt_dlg_proc, 0, _("GnuPG Options"), 
+			      IDS_WINPT_GPGOPT);
             return TRUE;
             
         case ID_KEYMISC_IMPORT:
-            t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"), NULL, NULL);
+            t = get_fileopen_dlg (dlg, _("Choose Name of the Key File"), 
+				  NULL, NULL);
             if (t)
                 km_file_import (dlg, t);
             return TRUE;
@@ -1465,14 +1538,15 @@
             
         case ID_KEYMISC_EXPORT:
             if (kmi->lv_idx == -1) {
-                msg_box( dlg, _("Please select a key."), _("Key Manager"), MB_ERR );
+                msg_box (dlg, _("Please select a key."),
+			 _("Key Manager"), MB_ERR);
                 return TRUE;
             }
 	    if (listview_count_items (kmi->lv, 1) > 1)
 		name = m_strdup ("Exported_GPG_Keys.asc");
 	    else {
-		listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
-		name = gen_export_filename (keyid, 0);
+		key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);		
+		name = km_gen_export_filename (key->subkeys->keyid+8, 0);
 	    }
             t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
 	    free_if_alloc (name);
@@ -1503,9 +1577,11 @@
                             "to copy the key to a safe place.\n\n"
                             "Do you really want to export the key?"),
                           _("WARNING"), MB_INFO|MB_YESNO);
-            if( i == IDYES ) {
-		listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-8 );
-		name = gen_export_filename (keyid, 1);
+            if (i == IDYES) {
+		key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+		if (!key)
+		    BUG (NULL);
+		name = km_gen_export_filename (key->subkeys->keyid+8, 1);
                 t = get_filesave_dlg (dlg, _("Choose Name for Key File"), NULL, name);
                 if (t != NULL)		
 		    km_privkey_export (dlg, kmi->lv, t);
@@ -1523,27 +1599,29 @@
 	    break;
 
 	case ID_KEYMISC_OT:
-	    dialog_box_param( glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST, glob_hwnd,
-			      ownertrust_dlg_proc, 0,
-			      _("Ownertrust"), IDS_WINPT_OWNERTRUST );
+	    dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_OWNERTRUST, 
+			      glob_hwnd, ownertrust_dlg_proc, 0,
+			      _("Ownertrust"), IDS_WINPT_OWNERTRUST);
 	    break;
 
-	case ID_KEYMISC_EDITKEY:	   
+	case ID_KEYMISC_EDITKEY:
 	    if (kmi->lv_idx == -1)
 		break;
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, sizeof (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    /* XXX: pub/crd = secret key does not work */
 	    memset (&k, 0, sizeof (k));
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
 	    k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    k.is_v3 = km_key_is_v3 (kmi->lv, kmi->lv_idx);
 	    k.flags = km_get_key_status (kmi->lv, kmi->lv_idx);
 	    dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT, dlg,
 			      keyedit_main_dlg_proc, (LPARAM)&k,
 			      _("Key Edit"), IDS_KEYCTX_EDIT);
 	    if (k.update)
-		update_key (kmi->lv,  kmi->lv_idx, keyid, 1);
+		update_key (kmi->lv,  kmi->lv_idx, k.keyid, 1);
 	    break;
             
         case ID_KEYMISC_COPY:
@@ -1559,9 +1637,11 @@
             break;
             
 	case ID_KEYCTX_SETPREFKS:
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM(keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    keyedit_set_pref_keyserver (&k, dlg);
 	    break;
 
@@ -1609,47 +1689,55 @@
 	    break;
 
 	case ID_KEYCTX_ADDKEY:
-            listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+            key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
             k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    keyedit_add_subkey (&k, dlg, NULL);
 	    if (k.update)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+		update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
 	    break;
 
 	case ID_KEYCTX_ADDUID:
-	    listview_get_item_text( kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
 	    k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    keyedit_add_userid (&k, dlg, NULL);
 	    if (k.update)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+		update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
 	    break;
 
 	case ID_KEYCTX_ADDREV:
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
-	    k.key_pair = km_check_for_seckey( kmi->lv, kmi->lv_idx, NULL );
+	    k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
 	    keyedit_add_revoker (&k, dlg);
 	    if (k.update)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+		update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
 	    break;
 
 	case ID_KEYCTX_ADDPHOTO:
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    memset (&k, 0, sizeof (k));
-	    k.keyid = keyid;
+	    k.keyid = key->subkeys->keyid+8;
 	    k.is_protected = km_check_if_protected (kmi->lv, kmi->lv_idx);
 	    k.key_pair = km_check_for_seckey (kmi->lv, kmi->lv_idx, NULL);
 	    keyedit_add_photo (&k, dlg);
 	    if (k.update)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 1);
+		update_key (kmi->lv, kmi->lv_idx, k.keyid, 1);
 	    break;
 
 	case ID_KEYCTX_KS_NL:
@@ -1671,26 +1759,30 @@
 	case ID_KEYCTX_UID_COPY:
 	    /* XXX: add generic function to support multiple selection
 	            with a callback */
-	    listview_get_item_text( kmi->lv, kmi->lv_idx, 0, uid, sizeof uid-1 );
-	    set_clip_text( NULL, uid, strlen( uid ) );
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    name = utf8_to_wincp2 (key->uids->uid);
+	    set_clip_text (NULL, name, strlen (name));
+	    safe_free (name);
 	    break;
 
 	case ID_KEYCTX_KEYID_COPY:
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1);
-	    set_clip_text (NULL, uid, strlen (uid));
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    set_clip_text (NULL, key->subkeys->keyid+8, 
+			   strlen (key->subkeys->keyid+8));
 	    break;
 
 	case ID_KEYCTX_FPR_COPY:
-	    key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);	  
-	    if (key) {
-		t = get_key_fpr (key);
-		set_clip_text (NULL, t? t : "", t? strlen (t): 0);
-	    }
+	    key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    //t = get_key_fpr (key);
+	    t = key->subkeys->fpr;
+	    set_clip_text (NULL, t? t : "", t? strlen (t): 0);
 	    break;
 
 	case ID_KEYCTX_KINFO_COPY:
-	    listview_get_item_text( kmi->lv, kmi->lv_idx, 1, uid, sizeof uid-1 );
-	    km_set_clip_info( uid );	    
+	    key = (gpgme_key_t) listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
+	    km_set_clip_info (key->subkeys->keyid+8);
 	    break;
 
         case ID_KEYCTX_COPY:
@@ -1704,11 +1796,12 @@
 	case ID_KEYCTX_DISABLE:
 	case ID_KEYCTX_ENABLE:
 	    i = LOWORD (wparam) == ID_KEYCTX_ENABLE? 1 : 0;
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, KM_COL_KEYID, 
-				    keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    rc = km_enable_disable_key (kmi->lv, dlg, kmi->lv_idx, i);
 	    if (!rc)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 0);
+		update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
 	    /* XXX: switching a key from disabled -> enabled. does not
 	       change the validity field in the KM. */
 	    break;
@@ -1718,22 +1811,37 @@
 	    break;
 
 	case ID_KEYCTX_MAXTRUST:
-	    listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
+	    key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+	    if (!key)
+		BUG (NULL);
 	    rc = km_set_implicit_trust (dlg, kmi->lv, kmi->lv_idx);
 	    if (!rc)
-		update_key (kmi->lv, kmi->lv_idx, keyid, 0);
+		update_key (kmi->lv, kmi->lv_idx, key->subkeys->keyid+8, 0);
 	    break;
 
         case ID_KEYCTX_SETDEFKEY:
 	    if (!km_check_key_status (kmi->lv, kmi->lv_idx)) {
-		listview_get_item_text (kmi->lv, kmi->lv_idx, 1, keyid, DIM (keyid)-1);
-		rc = set_gnupg_default_key (keyid);
+		key = (gpgme_key_t)listview_get_item2 (kmi->lv, kmi->lv_idx);
+		rc = set_gnupg_default_key (key->subkeys->keyid+8);
 		if (rc)
 		    msg_box (dlg, winpt_strerror (rc), _("Key Manager"), MB_ERR);
-		km_update_default_key_str (kmi->statbar);
+		update_default_key_str (kmi->statbar);
 	    }
             break;
 
+	case ID_KEYMISC_VIEWKEYID:
+	case ID_KEYMISC_VIEWCIPHER:
+	case ID_KEYMISC_VIEWTYPE:
+	case ID_KEYMISC_VIEWCREAT:
+	    DWORD n;
+
+	    hm = GetMenu (dlg);
+	    n = get_menu_state (hm, LOWORD (wparam));
+	    set_menu_state (hm, LOWORD (wparam), 
+			    n & MFS_CHECKED? MFS_UNCHECKED : MFS_CHECKED);
+	    modify_listview_columns (kmi, LOWORD (wparam), !(n & MFS_CHECKED));
+	    break;
+
 	case ID_GROUP_NEW:
         case ID_GROUP_PASTE:
         case ID_GROUP_DELETE:

Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyPropsDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -82,6 +82,15 @@
 }
 
 
+static void
+draw_nophoto_img (HWND dlg)
+{
+    /*..
+    n = DrawText (hdc, "No Photo-ID", -1, &r, DT_LEFT);
+    ..*/
+}
+
+
 /* Load the photo from the key @key */
 static int
 keyprops_load_photo (HWND dlg, gpgme_key_t key, gpgme_validity_t *r_valid)
@@ -99,8 +108,10 @@
 	get_uat_validity (key->subkeys->keyid, &k.ext->attrib.validity);
     *r_valid = k.ext->attrib.validity;
 
-    if (!img || !imglen)
+    if (!img || !imglen) {
+	draw_nophoto_img (dlg);
 	return -1;
+    }
     f = fopen (get_photo_tmpname (dlg), "wb");
     if (f) {
 	for (pos = 0; img[pos] != 0x10; pos++)

Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyRevokeDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -44,12 +44,17 @@
 {
     gpgme_key_t k;
     size_t i;
+    char *uid;
 
-    get_pubkey (keyid, &k);
-    _snprintf (fname, flen-1, "%s-RevocationCert.asc", k->uids->name);
-    for (i=0; i < strlen (fname); i++)
+    if (get_pubkey (keyid, &k))
+	BUG (NULL);
+    uid = utf8_to_wincp2 (k->uids->name);
+    _snprintf (fname, flen-1, "%s_RevocationCert.asc", uid);
+    for (i=0; i < strlen (fname); i++) {
 	if (fname[i] == ' ')
 	    fname[i] = '_';
+    }
+    safe_free (uid);
 }
 
 
@@ -64,7 +69,7 @@
     if (!err)
 	gpg_data_release_and_set_file (rev, fname);
     else
-	msg_box (NULL, gpgme_strerror (err), _("Key Revocation"), MB_ERR);
+	msg_box (NULL, gpgme_strerror (err), _("Key Revocation Cert"), MB_ERR);
     free (revcert);
 }
 
@@ -75,46 +80,48 @@
 {	
     static winpt_key_t k;
     gpgme_error_t err;
-    HWND list;	
+    HWND list;
     int idx, use_desc;
-    char desc[256], file[256], *p = NULL;
+    char desc[256], file[256];
     char pwd[256];
+    char *p = NULL;
     char *inp_data = NULL, *revcert=NULL;
+    const char *warning =
+	_("Please move this certificate to a medium where it can be"
+          "stored in a safe place (floppy, CDR, etc..).\n"
+          "If an attacker gets access to this certificate he can use it to "
+          "render your key unusable!");
     
     switch( msg ) {
     case WM_INITDIALOG:
         if( !lparam )
             dlg_fatal_error(dlg, "Could not get dialog param!");
         k = (winpt_key_t )lparam;
-        SetWindowText (dlg, _("Key Revocation"));
+        SetWindowText (dlg, _("Key Revocation Cert"));
 	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
 	SetDlgItemText (dlg, IDC_KEYREVOKE_REASONINF, _("Reason for revocation"));
 	SetDlgItemText (dlg, IDC_KEYREVOKE_OPTINF, _("Optional description text"));
 	SetDlgItemText (dlg, IDC_KEYREVOKE_PWDINF, _("&Passphrase"));
 	SetDlgItemText (dlg, IDC_KEYREVOKE_OUTINF, _("Output file"));
-        SetDlgItemText (dlg, IDC_KEYREVOKE_HINT,
-                        _("Please move this certificate to a medium where it can be "
-                          "stored in a safe place (floppy, CDR, etc..). "
-                          "If an attacker gets access to this certificate he can use it to "
-                          "render your key unusable!"));
-        list = GetDlgItem( dlg, IDC_KEYREVOKE_REASON );
+        list = GetDlgItem (dlg, IDC_KEYREVOKE_REASON);
 	listbox_add_string (list, _("0. No reason specified"));
         listbox_add_string (list, _("1. Key has been compromised"));
         listbox_add_string (list, _("2. Key is superseded"));
         listbox_add_string (list, _("3. Key is no longer used"));
+	SendMessage (list, LB_SETCURSEL, (WPARAM)0, 0);
         SetForegroundWindow (dlg);
 	center_window (dlg, NULL);
         return TRUE;
         
     case WM_SYSCOMMAND:
-        if( LOWORD( wparam ) == SC_CLOSE ) {
-            SetDlgItemText( dlg, IDC_KEYREVOKE_PWD, "" );
-            EndDialog( dlg, TRUE );
+        if (LOWORD (wparam) == SC_CLOSE) {
+            SetDlgItemText (dlg, IDC_KEYREVOKE_PWD, "");
+            EndDialog (dlg, TRUE);
         }
         return FALSE;
         
     case WM_COMMAND:
-        switch( LOWORD( wparam ) ) {
+        switch (LOWORD (wparam)) {
 	case IDC_KEYREVOKE_CHOOSE:
 	    const char *s;
 	    mk_cert_fname (k->keyid, file, sizeof file-1);
@@ -128,40 +135,42 @@
             idx = SendMessage (list, LB_GETCURSEL, 0, 0);
             if (idx < 0 || idx > 3) {
 		msg_box (dlg, _("Please select a reason."), 
-			 _("Key Revocation"), MB_ERR);
+			 _("Key Revocation Cert"), MB_ERR);
                 return TRUE;
             }
             if (!GetDlgItemText (dlg, IDC_KEYREVOKE_FILE, file, sizeof (file)-1)) {
 		msg_box (dlg, _("Please enter a file name."), 
-			 _("Key Revocation"), MB_ERR);
+			 _("Key Revocation Cert"), MB_ERR);
                 return TRUE;
             }
             use_desc = 1;
             if (!GetDlgItemText (dlg, IDC_KEYREVOKE_TEXT, desc, sizeof (desc)-1))
                 use_desc = 0;
             if( !GetDlgItemText (dlg, IDC_KEYREVOKE_PWD, pwd, sizeof (pwd)-1)) {
-		msg_box (dlg, _("Please enter the passphrase."), _("Key Revocation"), MB_ERR);
+		msg_box (dlg, _("Please enter the passphrase."), 
+			 _("Key Revocation Cert"), MB_ERR);
                 return TRUE;
             }
           
 	    if (use_desc)
 		p = wincp_to_utf8 (desc, strlen (desc));
 	    /* we use the keyid to avoid charset problems and UTF8 encodings.*/
-	    inp_data = generate_revoc_input (idx, use_desc? p : NULL, pwd);
+	    inp_data = generate_revoke_input (idx, use_desc? p : NULL, pwd);
             
-            err = gpg_revoke_key (inp_data, k->keyid, &revcert);
-	    wipememory (&pwd, sizeof (pwd));
-	    memset (inp_data, 0, strlen (inp_data));
+            err = gpg_revoke_cert (inp_data, k->keyid, &revcert);
+	    wipememory (pwd, sizeof (pwd));
+	    wipememory (inp_data, strlen (inp_data));
 	    free (inp_data);
 	    free_if_alloc (p);
 
             if (err) {
-                msg_box (dlg, gpgme_strerror (err), _("Key Revocation"), MB_ERR);
+                msg_box (dlg, gpgme_strerror (err), _("Key Revocation Cert"), MB_ERR);
 		if (revcert)
 		    free (revcert);
 	    }
 	    else {
-		msg_box (dlg, _("Revocation certificate generated."), _("GnuPG Status"), MB_OK);
+		show_msg (dlg, 1000, _("Revocation certificate generated."));
+		msg_box (dlg, warning, _("Key Revocation Cert"), MB_INFO);
 		release_cert_as_file (revcert, file);
 	    }
 	    EndDialog (dlg, TRUE);

Modified: trunk/Src/wptKeyRevokersDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokersDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyRevokersDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -39,17 +39,24 @@
 #include "wptVersion.h"
 #include "wptKeyEdit.h"
 #include "wptKeylist.h"
+#include "wptUTF8.h"
 
 
+enum revoke_col_t {
+    REV_COL_NAME    = 0,
+    REV_COL_KEYID   = 1,
+    REV_COL_ALGO    = 2
+};
+
 /* Initialize the listview given in @ctrl and return it in @r_lv. */   
 static int
 revokelist_build (listview_ctrl_t *r_lv, HWND ctrl)
 {
     listview_ctrl_t lv;
     struct listview_column_s rlist[] = {
-	{ 0,  55, (char *)_("Algorithm") },
-	{ 1,  80, (char *)_("Key ID") },
-	{ 2, 160, (char *)_("Name") },
+	{0, 160, (char *)_("Name") },
+	{1,  80, (char *)_("Key ID")},
+	{2,  55, (char *)_("Algorithm")},
 	{0}
     };
     int i, rc;
@@ -75,11 +82,12 @@
 revokelist_init (HWND ctrl, gpgme_key_t key, gpg_keycache_t ctx)
 {    
     gpgme_error_t err;
-    gpgme_key_t revkey;    
-    GpgKeyEdit *ke;    
+    gpgme_key_t revkey;
+    GpgKeyEdit *ke;
     gpg_desig_rev_t rev=NULL, r;
-    listview_ctrl_t lv;    
-    const char *id;
+    listview_ctrl_t lv;
+    const char *alg;
+    char *uid = NULL;
 
     ke = new GpgKeyEdit (key);
     if (!ke)
@@ -87,7 +95,8 @@
     err = ke->getDesignatedRevoker (&rev);
     if (err) {
 	delete ke;
-	msg_box (NULL, gpgme_strerror (err), _("Designated Key Revokers"), MB_ERR);
+	msg_box (NULL, gpgme_strerror (err), 
+		 _("Designated Key Revokers"), MB_ERR);
 	return NULL;
     }
 
@@ -95,15 +104,17 @@
 	BUG (0);
     for (r = rev; r; r = r->next) {
 	if (get_pubkey (r->fpr+32, &revkey))
-	    id = _("user ID not found");
+	    uid = strdup (_("user ID not found"));
 	else
-	    id = revkey->uids->name;
+	    uid = utf8_to_wincp2 (revkey->uids->name);
 	listview_add_item (lv, "");
-	listview_add_sub_item (lv, 0, 0, get_key_pubalgo (r->pubkey_algo));
-	listview_add_sub_item (lv, 0, 1, r->fpr+32);
-	listview_add_sub_item (lv, 0, 2, id);
+	alg = get_key_pubalgo (r->pubkey_algo);
+	listview_add_sub_item (lv, 0, REV_COL_ALGO, alg);
+	listview_add_sub_item (lv, 0, REV_COL_KEYID, r->fpr+32);
+	listview_add_sub_item (lv, 0, REV_COL_NAME, uid);
+	safe_free (uid);
     }
-        
+
     delete ke;
     gpg_desig_rev_release (rev);
     return lv;
@@ -141,21 +152,24 @@
 	if (notify && notify->code == NM_DBLCLK && 
 	    notify->idFrom == IDC_KEYREVOKERS_LIST) {
 	    int idx = listview_get_curr_pos (lv);
-	    listview_get_item_text (lv, idx, 1, keyid, DIM (keyid)-1);
-	    listview_get_item_text (lv, idx, 2, buf, DIM (buf)-1);
-	    if (!strcmp( buf, _("user ID not found"))) {
+	    listview_get_item_text (lv, idx, REV_COL_KEYID, keyid, DIM (keyid)-1);
+	    listview_get_item_text (lv, idx, REV_COL_NAME, buf, sizeof (buf)-1);
+	    if (!strcmp (buf, _("user ID not found"))) {
 		int id = log_box (_("Designated Key Revokers"), MB_YESNO|MB_INFO,
 				  _("Do you want to retrieve 0x%s via the default keyserver?"), keyid);
 		if (id == IDNO)
 		    break;
 		rc = hkp_recv_key (dlg, default_keyserver, 
-				   default_keyserver_port, buf, 0, 0);
-		if( !rc ) {
+				   default_keyserver_port, keyid, 0, 0);
+		if (!rc) {
 		    keycache_reload (dlg);
 		    if (get_pubkey (keyid, &key))
 			BUG (NULL);
-		    if (key->uids && key->uids->name)
-			listview_add_sub_item (lv, idx, 2, key->uids->name);
+		    if (key->uids && key->uids->name) {
+			char *uid = utf8_to_wincp2 (key->uids->name);
+			listview_add_sub_item (lv, idx, REV_COL_NAME, uid);
+			free (uid);
+		    }
 		}
 	    }
 	    else {

Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeylist.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -169,17 +169,6 @@
 }
 
 
-const char*
-get_key_pubalgo2 (gpgme_pubkey_algo_t alg)
-{
-    switch (alg) {
-    case GPGME_PK_DSA: return "D";
-    case GPGME_PK_RSA: return "R";
-    case GPGME_PK_ELG: return "G";
-    default: return "?";
-    }
-    return "?";
-}
 
 const char*
 get_key_algo (gpgme_key_t key, int keyidx)
@@ -212,15 +201,19 @@
 get_key_created (long timestamp)
 {
     static char timebuf[128];
+    const char *dat;
     struct tm *warp;
 
     if (timestamp == 0 || timestamp == -1)
 	return "????" "-??" "-??";
-    warp = localtime( &timestamp );
-    _snprintf( timebuf, sizeof timebuf - 1, "%04d-%02d-%02d",
-		warp->tm_year + 1900, warp->tm_mon + 1, warp->tm_mday );
+    dat = get_locale_date (timestamp, timebuf, sizeof (timebuf)-1);
+    if (dat)
+	return dat;
+    warp = localtime (&timestamp);
+    _snprintf (timebuf, sizeof timebuf - 1, "%04d-%02d-%02d",
+	       warp->tm_year + 1900, warp->tm_mon + 1, warp->tm_mday);
     return timebuf;
-} /* get_key_created */
+}
 
 
 /* Return a string presentation of the time @timestamp. */
@@ -249,7 +242,7 @@
     else if (type == 2)
 	return _("Key Pair (Card)");
     return _("Public Key");
-} /* get_key_type */
+}
 
 
 const char*
@@ -275,10 +268,22 @@
     }
     _snprintf( size_id, sizeof (size_id) - 1, "%d", size_main );
     return size_id;
-} /* get_key_size */
+}
 
 
 const char*
+get_key_pubalgo2 (gpgme_pubkey_algo_t alg)
+{
+    switch (alg) {
+    case GPGME_PK_DSA: return "D";
+    case GPGME_PK_RSA: return "R";
+    case GPGME_PK_ELG: return "G";
+    default: return "?";
+    }
+    return "?";
+}
+
+const char*
 get_key_pubalgo (gpgme_pubkey_algo_t alg)
 {
     switch (alg) {
@@ -320,7 +325,7 @@
 	}
     }
     return fpr_md;
-} /* get_key_fpr */
+}
 
 
 const char *
@@ -542,13 +547,13 @@
     };
 
     struct listview_column_s klist[] = {
-    {0, 242, (char *)_("User ID")},
+    {0, 240, (char *)_("User ID")},
     {1, 78, (char *)_("Key ID")},
     {2, 52, (char *)_("Type")},    
-    {3, 68, (char *)_("Size")},
-    {4, 66, (char *)_("Cipher")},
-    {5, 70, (char *)_("Validity")},
-    {6, 40, (char *)_("Trust")},
+    {3, 66, (char *)_("Size")},
+    {4, 60, (char *)_("Cipher")},
+    {5, 66, (char *)_("Validity")},
+    {6, 58, (char *)_("Trust")},
     {7, 72, (char *)_("Creation")},
     {0, 0, NULL}
     };
@@ -771,18 +776,62 @@
 }
 
 
+/* Update a single column @col but for each element in the
+   listview @lv. */
 void
+keylist_upd_col (listview_ctrl_t lv, int col)
+{
+    gpgme_key_t key;
+    const char *s;
+    char buf[32];
+    int i;
+
+    for (i=0; i < listview_count_items (lv, 0); i++) {
+	key = (gpgme_key_t)listview_get_item2 (lv, i);
+	if (!key)
+	    continue;
+	switch (col) {
+	case KM_COL_KEYID:
+	    _snprintf (buf, sizeof (buf)-1, "0x%s", key->subkeys->keyid+8);
+	    listview_add_sub_item (lv, i, col, buf);
+	    break;
+
+	case KM_COL_CIPHER:
+	    s = get_key_algo (key, 0);
+	    listview_add_sub_item (lv, i, col, s);
+	    break;
+
+	case KM_COL_TYPE:
+	    s = find_secret_key (key)? "pub/sec" : "pub";
+	    listview_add_sub_item (lv, i, col, s);
+	    break;
+
+	case KM_COL_CREAT:
+	    s = get_key_created (key->subkeys->timestamp);
+	    listview_add_sub_item (lv, i, col, s);
+	    break;
+	}
+    }
+}
+
+/* Update the listview item at position @pos with the data from
+   the key @key. */
+void
 keylist_upd_key (listview_ctrl_t lv, int pos, gpgme_key_t key)
 {
     const char *s;
+    char *uid;
     char tmp[32];
 
     listview_set_item2 (lv, pos, (void *)key);
     /* the only mode we support is KYLIST_LIST in the Key Manager */
     
     s = key->uids->uid;
-    if (s)
-	listview_add_sub_item (lv, pos, 0, s);
+    if (s) {
+	uid = utf8_to_wincp2 (s);
+	listview_add_sub_item (lv, pos, 0, uid);
+	free (uid);
+    }
 
     s = key->subkeys->keyid;
     if (s) {

Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeyserverDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -38,6 +38,7 @@
 #include "wptKeyManager.h"
 #include "wptContext.h" /* for passphrase_s */
 #include "wptDlgs.h"
+#include "wptUTF8.h"
 
 
 #define MAX_KEYSIZE 70000
@@ -113,7 +114,7 @@
     gpgme_ctx_t ctx;
     gpgme_error_t err;
     const char *s;
-    char *p;
+    char *p, *uid;
     size_t n=0;
 
     if (!res)
@@ -139,10 +140,11 @@
 
     for (t=res->imports; t; t = t->next) {
 	if (!gpgme_get_key (ctx, t->fpr, &key, 0)) {
-	    s = key->uids->uid;
+	    s = uid = utf8_to_wincp2 (key->uids->uid);
 	    gpgme_data_write (msg, s, strlen (s));
 	    gpgme_data_write (msg, "\n", 1);
 	    gpgme_key_release (key);
+	    free (uid);
 	}
     }
     gpgme_data_write (msg, "\0", 1);

Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeysigDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -358,6 +358,7 @@
 	lv = siglist_load (GetDlgItem (dlg, IDC_KEYSIG_LIST), k->keyid);
 	if (!check_for_missing_keys (lv))
 	    EnableWindow (GetDlgItem (dlg, IDC_KEYSIG_RECVKEY), FALSE);
+	EnableWindow (GetDlgItem (dlg, IDC_KEYSIG_SIGPROPS), FALSE);
 	k->callback.ctl = lv;
 	sl = GetDlgItem (dlg, IDC_KEYSIG_LIST);
 	siglist_proc.dlg = dlg;

Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptKeysignDlg.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -337,14 +337,15 @@
 		ke->setLocalUser (k);
 
 	    err = ke->signKey (type, sig_class_choice, expires? keymsg : "0");
-	    memset (&pwd, 0, sizeof pwd);	    
+	    wipememory (pwd, sizeof (pwd));
 	    if (err) {
 		delete ke;
 		msg_box (dlg, gpgme_strerror (err), _("Key Signing"), MB_ERR);
 		return TRUE;
 	    }
 	    if (ke->getResult () != 0)
-		msg_box (dlg, _("This key is already signed by your key"), _("Key Signing"), MB_INFO);
+		msg_box (dlg, _("This key is already signed by your key"), 
+			 _("Key Signing"), MB_INFO);
 	    else {
 		status_box (dlg, _("Key successfully signed."), PGM_NAME);
 		key->update = 1;

Modified: trunk/Src/wptListView.cpp
===================================================================
--- trunk/Src/wptListView.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptListView.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -18,6 +18,7 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -181,6 +182,14 @@
 
 
 int
+listview_del_column (listview_ctrl_t ctx, int pos)
+{
+    ctx->cols--;
+    return ListView_DeleteColumn (ctx->ctrl, pos)? 0 : 1;
+}
+
+
+int
 listview_del_item( listview_ctrl_t ctx, int pos )
 {
     int rc = 0;
@@ -351,3 +360,11 @@
     return pos;
 }
 
+
+void
+listview_setview (listview_ctrl_t ctx, DWORD view)
+{
+    DWORD style = GetWindowLong (ctx->ctrl, GWL_STYLE);
+    if ((style & LVS_TYPEMASK) != view)
+	SetWindowLong (ctx->ctrl, GWL_STYLE, (style & ~LVS_TYPEMASK) | view);
+}

Modified: trunk/Src/wptMAPI.cpp
===================================================================
--- trunk/Src/wptMAPI.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptMAPI.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -376,12 +376,12 @@
 
 
 static int
-add_recipient (gpgme_recipients_t * r_rset, const char * addr)
+add_recipient (gpgme_recipients_t *r_rset, const char *addr)
 {
     gpg_keycache_t pub = keycache_get_ctx (1);
     gpgme_key_t key;
     gpgme_error_t rc;
-    const char * s;
+    char *uid;
 
     if (!*r_rset)
 	gpgme_recipients_new (&(*r_rset));
@@ -390,9 +390,11 @@
 	log_box (_("Add Recipient"), MB_ERR, _("Could not find key for '%s'"), addr);
 	return -1;
     }
-    s = key->uids->uid;
-    if (s)
-	gpgme_recipients_add_name (*r_rset, s);
+    if (key->uids->uid) {
+	uid = utf8_to_wincp2 (key->uids->uid);
+	gpgme_recipients_add_name (*r_rset, uid);
+	free_if_alloc (uid);
+    }
     return 0;
 } /* add_recipient */
 

Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptMainProc.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -44,7 +44,6 @@
 #include "wptCard.h"
 #include "wptCryptdisk.h"
 #include "wptCardEdit.h"
-#include "wptCrypto.h"
 
 static int cmd = 0;
 static int wipe_contents = 0;
@@ -193,15 +192,15 @@
     gpgme_error_t err;
     int type;
     
-    if( (id == ID_WINPT_SIGN || id == ID_WINPT_SIGNENCRYPT)
-	&& gnupg_access_keyring (0) ) {
-	msg_box( hwnd, _("Could not access secret keyring."), _("Sign"), MB_ERR );
+    if ((id == ID_WINPT_SIGN || id == ID_WINPT_SIGNENCRYPT)
+	&& gnupg_access_keyring (0)) {
+	msg_box (hwnd, _("Could not access secret keyring."), _("Sign"), MB_ERR);
 	return;
     }
     
     switch( id ) {
     case ID_WINPT_SYMENC:
-        gpg_encrypt_symmetric();
+        gpg_encrypt_symmetric ();
         break;
         
     case ID_WINPT_ENCRYPT:
@@ -321,7 +320,6 @@
 {		
     static NOTIFYICONDATA NID;
     static int use_hotkey = 0;    
-    reminder_ctx_s ctx;
     LPARAM param;
     curr_wnd_ctx currwnd = {0};	
     int rc, set_wc = 0, has_data = 0;
@@ -515,9 +513,7 @@
 		msg_box( hwnd, winpt_strerror (WPTERR_CLIP_EMPTY),_("Clipboard"), MB_ERR );
 		break;
 	    }
-            ctx.msecs = 500;
-            window_reminder( &ctx );			
-            clip_gpg_dlg( hwnd, (int)wparam );
+            clip_gpg_dlg (hwnd, (int)wparam);
             break;
             
             /** Current window operations **/
@@ -534,11 +530,9 @@
 			winpt_strerror( WPTERR_CURR_WND ) );
                 break;
             }
-            ctx.msecs = 500;
-            window_reminder( &ctx );
-            rc = currwnd_gpg_dlg( hwnd, (UINT)wparam, &set_wc );
-            if( !rc && set_wc )
-                set_window_contents( hwnd, &currwnd );
+            rc = currwnd_gpg_dlg (hwnd, (UINT)wparam, &set_wc);
+            if (!rc && set_wc)
+                set_window_contents (hwnd, &currwnd);
             break;
             
             /** File handling **/

Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptPassphraseCB.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -157,7 +157,6 @@
 	}
 	center_window (dlg, NULL);
 	SetForegroundWindow (dlg);
-	set_active_window (dlg);
 	return FALSE;
 
 	case WM_SYSCOMMAND:

Modified: trunk/Src/wptRegistry.cpp
===================================================================
--- trunk/Src/wptRegistry.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptRegistry.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -36,12 +36,6 @@
 
 #define rc_ok(rc) ((rc) == ERROR_SUCCESS)
 
-static gpg_filetype gpg_filetypes[] = {
-    {"GPG Detached Signature", ".sig", 1},
-    {"GPG Encrypted Data",     ".gpg", 2},
-    {"GPG Armored Data",       ".asc", 2},
-    {0}
-};
 
 
 struct reg_hotkey_s reg_hotkeys[] = {
@@ -161,12 +155,19 @@
    Return value: 0 on success. */
 int
 regist_inst_winpt (int with_ext, int *created)
-{
+{    
     HKEY reg;
     char *p = NULL;
     char modpath[MAX_PATH+1];
     int rc, i, id, n = 0;
 
+    gpg_filetype gpg_filetypes[] = {
+	{_("GPG Detached Signature"), ".sig", 1},
+	{_("GPG Encrypted Data"),     ".gpg", 2},
+	{_("GPG Armored Data"),       ".asc", 2},
+	{0}
+    };
+
     if (created)
 	*created = 0;
 
@@ -225,7 +226,7 @@
     if (created)
 	*created = 1;
     RegCloseKey (reg);
-    if (n)
+    if (n > 0 || is_gpgee_installed ())
 	set_reg_entry (HKEY_CURRENT_USER, WINPT_REG, "Extensions", "1");
     if ((n=GetModuleFileName (NULL, modpath, MAX_PATH-1)) > 0) {
 	while (n-- > 0) {

Modified: trunk/Src/wptVerifyList.cpp
===================================================================
--- trunk/Src/wptVerifyList.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptVerifyList.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -18,6 +18,7 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -60,16 +61,25 @@
 /* String representaton of the time in @timestamp.
    Format YEAR-MON-DAY HOUR:MIN:SEC.
    Return value: time as formatted string. */
-const char *
+const char*
 strtimestamp (long timestamp)
 {
-    static char timebuf[64] = {0};
+    static char timebuf[64];
     struct tm *warp;
+    const char *dat;
     
+    dat = get_locale_date (timestamp, timebuf, sizeof (timebuf)-1);
     warp = localtime (&timestamp);
-    _snprintf (timebuf, sizeof timebuf - 1, "%04d-%02d-%02d %02d:%02d:%02d",
-               warp->tm_year+1900, warp->tm_mon+1, warp->tm_mday,	
-               warp->tm_hour, warp->tm_min, warp->tm_sec);
+    if (!dat)
+	_snprintf (timebuf, sizeof (timebuf) - 1, 
+		   "%04d-%02d-%02d %02d:%02d:%02d",
+		    warp->tm_year+1900, warp->tm_mon+1, warp->tm_mday,	
+		    warp->tm_hour, warp->tm_min, warp->tm_sec);
+    else
+	_snprintf (timebuf, sizeof (timebuf)-1,
+		   "%s %02d:%02d:%02d", dat,
+		   warp->tm_hour, warp->tm_min, warp->tm_sec);
+
     return timebuf;
 }
 
@@ -139,7 +149,7 @@
     const char * attr;
     u32 key_attr;
     char keyid[32+1];
-    char * uid = NULL;
+    char *uid = NULL;
     
     if (listview_add_item (lv, " "))
 	return WPTERR_GENERAL;
@@ -183,7 +193,7 @@
     }
     else {
 	attr = key->uids->name;
-	uid = utf8_to_wincp (attr, strlen (attr));
+	uid = utf8_to_wincp2 (attr);
 	if (uid) {
 	    listview_add_sub_item( lv, 0, 4, (char *)uid );
 	    free (uid);
@@ -247,7 +257,7 @@
 	listview_add_sub_item (lv, 0, 4, t);
     }
     else if (log->user_id) {
-	char *p = utf8_to_wincp (log->user_id, strlen (log->user_id));
+	char *p = utf8_to_wincp2 (log->user_id);
 	if (p) {
 	    listview_add_sub_item (lv, 0, 4, p);
 	    free (p);

Modified: trunk/Src/wptW32API.cpp
===================================================================
--- trunk/Src/wptW32API.cpp	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/Src/wptW32API.cpp	2005-12-30 13:56:10 UTC (rev 129)
@@ -29,6 +29,7 @@
 #include <shellapi.h>
 #include <shlobj.h>
 #include <commctrl.h>
+#include <time.h>
 
 #include "wptNLS.h"
 #include "wptW32API.h"
@@ -56,7 +57,7 @@
 
 /* Set the text of a menu item @m_uid to @text. */
 void
-set_menu_text (HMENU menu, int m_uid, const char *text)
+set_menu_text (HMENU menu, UINT m_uid, const char *text)
 {
     set_menu_text_ext (menu, 0, m_uid, text);
 }
@@ -64,7 +65,7 @@
 
 /* Set the text of a menu item with the position @pos to @text. */
 void
-set_menu_text_bypos (HMENU menu, int pos, const char *text)
+set_menu_text_bypos (HMENU menu, UINT pos, const char *text)
 {
     set_menu_text_ext (menu, 1, pos, text);
 }
@@ -72,7 +73,7 @@
 
 /* Set the state of a menu item @m_uid to @state. */
 void
-set_menu_state (HMENU menu, int m_uid, int state)
+set_menu_state (HMENU menu, UINT m_uid, UINT state)
 {	
     MENUITEMINFO mii;
 
@@ -84,6 +85,20 @@
 }
 
 
+/* Retrieve the state of the menu item @m_uid and return it. */
+UINT
+get_menu_state (HMENU menu, UINT m_uid)
+{
+    MENUITEMINFO mii;
+
+    memset (&mii, 0, sizeof (mii));
+    mii.cbSize = sizeof (mii);
+    mii.fMask = MIIM_STATE;
+    GetMenuItemInfo (menu, m_uid, FALSE, &mii);
+    return mii.fState;
+}
+
+
 enum {
     CDLG_FILE_OPEN = 0,
     CDLG_FILE_SAVE = 1
@@ -502,35 +517,58 @@
 }
 
 
-void
-set_active_window( HWND dlg)
-{	
-    activ_hwnd = dlg;
-} /* set_active_window */
+/* Return date in a format which complies with the
+   system locale settings. */
+const char*
+get_locale_date (long tm_t, char *buf, DWORD buflen)
+{ 
+    SYSTEMTIME st; 
+    struct tm *ptm;
 
-void
-reset_active_window( void )
-{	
-    activ_hwnd = NULL;
-} /* reset_active_window */
+    ptm = localtime (&tm_t);  
+    st.wYear = (WORD)ptm->tm_year;
+    st.wMonth = (WORD)ptm->tm_mon;
+    st.wDay = (WORD)ptm->tm_mday;
+    st.wYear += 1900;
+    st.wMonth += 1;
+    if (!GetDateFormat (LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, 
+		        NULL, buf, buflen))
+	return NULL;
+    return buf;
+}
 
 
-static DWORD CALLBACK 
-reminder_thread (void *ctx)
-{
-    reminder_ctx_s *c = (reminder_ctx_s *)ctx;
+struct reminder_hd_s {
+    int msecs;
+    HWND dlg;
+    HANDLE hd;
+};
 
-    Sleep( c->msecs );
-    SetForegroundWindow( activ_hwnd );
 
+static DWORD CALLBACK
+foreground_reminder_thread (void *c)
+{
+    struct reminder_hd_s *ctx = (struct reminder_hd_s *)c;
+    Sleep (ctx->msecs);
+    SetForegroundWindow (ctx->dlg);
+    CloseHandle (ctx->hd);
+    delete ctx;
+    ExitThread (0);
     return 0;
-} /* reminder_thread */
+}
 
+/* Try to force the window @dlg to the foreground.
+   On NT5 or later this will not work if the user
+   is working in another window (console for example). */
+void
+force_foreground_window (HWND dlg, int msecs)
+{
+    struct reminder_hd_s *hd;
+    DWORD tid;
 
-HANDLE
-window_reminder( struct reminder_ctx_s *ctx )
-{
-    DWORD tid = 0;
-    
-    return CreateThread( NULL, 0, reminder_thread, ctx, 0, &tid );
-} /* window_reminder */
+    hd = new reminder_hd_s;
+    hd->dlg = dlg;
+    hd->msecs = msecs;
+    hd->hd = CreateThread (NULL, 0, foreground_reminder_thread, 
+			   hd, NULL, &tid);
+}

Modified: trunk/TODO-GPGME-PORT.txt
===================================================================
--- trunk/TODO-GPGME-PORT.txt	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/TODO-GPGME-PORT.txt	2005-12-30 13:56:10 UTC (rev 129)
@@ -18,8 +18,3 @@
   the window/process freezes up.
 
 * Either use gpgconf or improve the gpg config file parser.
-
-* Check for memory leaks, espcially in cleanup cases.
-
-* Find out why the gpgme_op_decrypt_result_t (recipients)
-  does not contain all recipients sometimes.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-12-19 13:05:59 UTC (rev 128)
+++ trunk/configure.ac	2005-12-30 13:56:10 UTC (rev 129)
@@ -15,7 +15,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.4-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.4, http://www.winpt.org)
 
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.0



More information about the Winpt-commits mailing list