[Winpt-commits] r256 - in trunk: . Doc Gnupg PTD Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sat Aug 5 12:31:18 CEST 2006
Author: twoaday
Date: 2006-08-05 12:31:06 +0200 (Sat, 05 Aug 2006)
New Revision: 256
Added:
trunk/PTD/wptDNSKeys.h
Modified:
trunk/AUTHORS
trunk/Doc/winpt.texi
trunk/FAQ
trunk/Gnupg/armor.c
trunk/NEWS
trunk/PTD/ChangeLog
trunk/PTD/Makefile.am
trunk/PTD/PTD.def
trunk/PTD/wptDNSKeys.cpp
trunk/Po/ChangeLog
trunk/Po/LINGUAS
trunk/Po/de.po
trunk/Po/jp.po
trunk/Po/pt_BR.po
trunk/README
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptClipEncryptDlg.cpp
trunk/Src/wptClipSignDlg.cpp
trunk/Src/wptClipVerifyDlg.cpp
trunk/Src/wptDateDlg.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptFileManagerDlg.cpp
trunk/Src/wptFileStatDlg.cpp
trunk/Src/wptFirstRunDlg.cpp
trunk/Src/wptGPGOptDlg.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeyCache.cpp
trunk/Src/wptKeyEditOwnertrustDlg.cpp
trunk/Src/wptKeyImportStatusDlg.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyPropsDlg.cpp
trunk/Src/wptKeyRevokeDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/Src/wptKeyserverSearchDlg.cpp
trunk/Src/wptKeysigDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/Src/wptVerifyList.cpp
trunk/THANKS
trunk/TODO
trunk/configure.ac
Log:
1.0.0pre3 release.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/AUTHORS 2006-08-05 10:31:06 UTC (rev 256)
@@ -31,30 +31,14 @@
*** This code is currently UNUSED ***
-Cryptdisk implementation
-wptFileDisk.cpp
-(Bo Brantén, Stefan Scherrer)
-
+wptFileDisk.cpp - Brantén, Stefan Scherrer
wptSecmem.cpp - John J. Kane <jkane89 at softhome.net>
Translators:
-(maintained)
[Japanese] Davar Pishva <dpishva at andrew.cmu.edu>
[German] Timo Schulz <twoaday at freakmail.de>,
Thomas Henlich <henlich at mmers1.mw.tu-dresden.de>
Ralf Kreutzmann <ralf.kreutzmann at equipmente.de>
[Portuguese/Brazil] Eduardo S. Dobay <edudobay at gmail.com>
-
-(inactive/obsolete)
-[French] Nicolas Robaux <nicolas at robaux.com>
- Pascal Brochart <pbrochart at tuxfamily.org>
-[Italy] Andrea Ungaro <semperfin at tin.it>,
- Scirè Salvatore <scires at tin.it>
-[Espana] Fernando Aversa <aversa at unsl.edu.ar>
- Pedro José <pedrojgm at hotmail.com>
-[Russian] Vasyl Kondrashov <vasyl at male.ru>
-[Brazil/Portuguese] Fabio Junior Beneditto <fjbeneditto at yahoo.com.br>
-[Portuguese] Emanuel de Jesus <ejesus at bigfoot.com>
-[Hungary] Ferenc Havránek <hf at delvidek.hu>
-[Czech] Jiri Netolicky <netolicky at datis.cdrail.cz>
-
+[Slovak] Martin Lukac <menorx at yahoo.com>
+[French] Pascal Brochart <pbrochart at tuxfamily.org>
Modified: trunk/Doc/winpt.texi
===================================================================
--- trunk/Doc/winpt.texi 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Doc/winpt.texi 2006-08-05 10:31:06 UTC (rev 256)
@@ -8,7 +8,7 @@
Copyright (C) 2006 Timo Schulz
-Version 0.9.0
+Version 1.0.0
@settitle WinPT - The Windows Privacy Tray; a free GPG front-end
@@ -16,12 +16,13 @@
First you need to have a working GnuPG 1.4 installtion on the machine you plan to install WinPT.
If you do not have GPG in your machine, please visit http://www.gnupg.org and download the latest
-GPG version there. It comes with a graphical installer so there is no need to do this step manually.
+GPG version there. It comes with a graphical installer so there is no need to do the
+installation manually.
You need at least Windows 98/2K/XP, but Windows XP or better is recommend. The program also works
on NT/95/ME but there is no support for these OS versions any longer. Mainly because the OS
vendor also dropped support and no bug fixes will be provided any longer.
-And it is very likely that work optimal on such platforms.
+And it is very likely that the program does not work optimal on such platforms.
@section A short Introduction
@@ -86,17 +87,6 @@
is very easy to use with an average size (~4MB). For non-German speaking users, I recommend the
light version because it does not contain the 2 German PDF manuals.
- at subsection Getting the Source of the Program
-As free software, according to the GNU General Public License, WinPT also offers the source code
-for the program. It can be used for reviews, to compile your own binary and/or to modify and/or
-redistribute it or just to learn how it works. The source is available at the same place you
-downloaded the binary. If not, you should contact the author of the site.
-The entire program can be build with free software; the default environment is a cross-compiler
-hosted on a Linux box. All you need is the mingw32 packages, a working autoconf environment
-and the libs WinPT depends on (currently gpgme and libgpg-error).
-It is also possible to build the binary with cygwin/mingw32 on Windows but this environment is
-not actively supported and propably needs adjustment of the source.
-
@subsection Configure the Program
After the installation not much of the default settings need to be changed. If you prefer a
special keyserver, it is propably a good idea to open the keyserver dialog and to set one of the
@@ -129,6 +119,31 @@
To enable keyring backups, the user can either decide to use the GPG home directory as the backup
folder or any other folder. In the latter case, a folder needs to be chosen.
+ at subsection Getting the Source of the Program
+As free software, according to the GNU General Public License, WinPT also offers the source code
+for the program. It can be used for reviews, to compile your own binary and/or to modify and/or
+redistribute it or just to learn how it works. The source is available at the same place you
+downloaded the binary. If not, you should contact the author of the site.
+The entire program can be build with free software; the default environment is a cross-compiler
+hosted on a Linux box. All you need is the mingw32 packages, a working autoconf environment
+and the libs WinPT depends on (currently gpgme and libgpg-error).
+It is also possible to build the binary with cygwin/mingw32 on Windows but this environment is
+not actively supported and propably needs adjustment of the source.
+
+
+ at section Native Language Support
+
+The program has the ability to select different languages to provide dialogs and error messages
+in the native language of the user. Currently German, Japanese, Portuguese (Brazil) and Slovak.
+When WinPT has been installed via a graphical installer, for example Gpg4Win, the language was
+automatically selected based on the locale Windows environment. If the stand-alone binary was
+downloaded, WinPT offers at the first start to select a language, based on the .mo file it
+founded in the current directory.
+Otherwise the user needs to perform the following steps. The WinPT ZIP archive contains various
+.mo files (de.mo, jp.mo, sk.mo) and the user needs to find his native language, if available and
+rename the file to "winpt.mo". For example, if the user prefers German, "de.mo" -> "winpt.mo".
+Now the user needs to save the locale dir, where the winpt.mo is stored, in the GPG preference dialog.
+
@section The First Start
This section is only important for people who never installed and/or used WinPT before and thus
@@ -150,6 +165,18 @@
is no way to recover the encrypted data. That is why it is also important to store the backup, at
least of the secret keyring, at a @strong{safe} place.
+ at subsection Use existing Keyrings and/or Keys
+If you already have a valid OpenPGP key pair and you do not want to generate a new key pair, you
+should select the second choice at the first start. Then the program will copy your existing keyrings
+to the new home directory. Please bear in mind that you need to set the ownertrust manually for each
+imported key. You can skip this step if you exported the ownertrust manually to a file, but because
+this is a step for experienced users it is not described here. The most important step is, to set
+your own key to ultimate ownertrust after import.
+
+If you have other OpenPGP programs and you wish to use the keys from this application, it is a good
+idea to select all keys you want to use and to export them into a single file. Then open the WinPT
+Key Manager and drag the file into the Key Manager window.
+
@section The Passphrase for the Secret Key
First a short explaination what passphrase is. A passphrase is like a password but usually
@@ -163,7 +190,7 @@
some intentionally made spelling mistakes.
Example: Row - row - row your boat, gently down the stream
-Passphrase: "R - r - ryb,gdt"
+Passphrase: "R - r - ryb,gdts"
Never write down or passphrase or share it among other people!
@@ -207,7 +234,8 @@
@subsection Search for a key by pattern
If you want to communicate with a new mail partner and you are not sure about the key ID, it can
-be useful to search for his email address. This address is considered as quite unique.
+be useful to search for his email address. This address is considered as quite unique.
+Not all keyserver support this query mode, so if you get an error please use subkeys.pgp.net.
An example:
@@ -220,6 +248,7 @@
should be clicked. Then the key will be downloaded and added to your keyring. Now you can encrypt
data with this key, for example an email.
+
@subsection Sending a Key to the Keyserver
After you generated a new key pair, it is a good idea to send your key to the keyserver to make
it available for other users. If you issue a signature, the key ID is part of the signature and
@@ -281,7 +310,7 @@
Compared to the clipboard mode, the CWS mode has some advantages. Let us assume that you want to
extract text from an editor window. With the CWS mode, the program automatically tries to focus
the window to select the text and to copy it to the clipboard and execute the
-selected command (Sign, Encrypt, Decrypt).
+selected command (Sign, Encrypt, Decrypt) and pastes back the GPG data to the window.
No manual user interaction is needed. Except this different behaviour, it is very likewise to the
clipboard mode and thus we do not describe each command again.
@@ -534,6 +563,43 @@
@end itemize
+
+ at section A short Note about Cryptographic Issues
+
+WinPT itself does not perform any real encryption, signing or decryption. Instead it uses
+GPG as the backend program which provides all kind of cryptographic code to perform the
+needed operations.
+
+The default values WinPT uses for key sizes, should be sufficient for personal and commercial
+security for the next years. If you are concerned about the default values, you can always use
+the expert key generation to make your own decision. GPG also provides
+default values for symmetric cipher preferences. By default, the AES (Advanced Encryption Standard)
+is used which provides a very good security. You can manually modify your key preferences, this
+includes cipher, hash, and compression but usually this is not necessary and also can do harm if
+you use algorithms which are not very widespread among other OpenPGP programs.
+
+ at section WinPT and Personal Firewalls
+
+Because the program uses a global hook to remember the last active current window, it might be
+possible that Firewalls warn that the process contains a global hook which is a potential
+security risk. In some cases, there might be even a warning that key logging is possible.
+This is a false alarm because the hook provided by the program, a CTB (Computer Based Training)
+hook, can be only used to save handles of newly created windows, or windows which are
+activated or in case of a focus change. Details can be found in the source code of the program
+or additional information about the CTB hook at msdn.microsoft.com
+
+To provide access to keyservers and to download HTTP keys, the program
+needs to be able to make outbound connections to the following ports: 80 (http), 11371 (keyserver)
+
+ at subsection Using a HTTP Proxy
+If you are behind a firewall and you have no chance make a connection to a keyserver, maybe
+because of a policy, you can use a http proxy for outbound connections. Open the Keyserver dialog
+and click on the button "Change Proxy". A new dialog opens where you can enter the proxy specific
+host name and ports. If the proxy requires authentication, you also have to provide your user name
+and your password. Please bear in mind that only a base64 authentication is supported and no other
+proxy types (SOCKS for example) can be used.
+
+
@section Reporting a Problem (Bug) or a Feature Request
For the case that you have problems with the program, that includes crashes or or the handling,
Modified: trunk/FAQ
===================================================================
--- trunk/FAQ 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/FAQ 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,4 @@
The Tiny WinPT FAQ.
- (warning: file is obsolete!)
Version 1.0
Modified: trunk/Gnupg/armor.c
===================================================================
--- trunk/Gnupg/armor.c 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Gnupg/armor.c 2006-08-05 10:31:06 UTC (rev 256)
@@ -118,15 +118,7 @@
strcpy( armor_error, msg );
}
-const char*
-get_armor_error( void )
-{
- if( armor_errno )
- return armor_error;
- return NULL;
-}
-
static unsigned int
check_trailing_chars( const byte *line, unsigned int len,
const char *trimchars )
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/NEWS 2006-08-05 10:31:06 UTC (rev 256)
@@ -836,7 +836,7 @@
* Fix sigv due to missing patch.
-Noteworthy changes in version 1.0.0 (2006-06-XX)
+Noteworthy changes in version 1.0.0preX (2006-07-XX)
================================================
* The passphrase dialog now contains an additional
@@ -894,3 +894,33 @@
do now support sorting.
[updated translations: Japanese, German, Portuguese(BR)]
+
+
+Noteworthy changes in version 1.0.0 (unreleased)
+================================================
+
+* Bug fix in file name handling for the MAPI feature.
+
+* The key sign dialog now lists all user IDs and not only
+ the primary to indicate that all user IDs will be signed.
+
+* The signature property dialog now contain all useful
+ information about the sig, which includes the creation date.
+
+* A bug in the key deleting code has been fixed. The problem
+ is only related to the GUI synchronisation and not the delete
+ process itself.
+
+* Support to retrieve the PKA record directly from the DNS.
+ This allows to perform a validity check of the key if a
+ PKA record is available for the key.
+
+* The Current Window Support does know correctly reset the
+ cursor position within the foreground window.
+
+* Fix problem in the key cache which might lead to a segv
+ after importing a secret key or if the last secret key
+ will be deleted.
+
+[updated translation: Slovak, German]
+
Modified: trunk/PTD/ChangeLog
===================================================================
--- trunk/PTD/ChangeLog 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/PTD/ChangeLog 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,3 +1,10 @@
+2006-07-30 Timo Schulz <ts at g10code.de>
+
+ * wptDNSKeys.h: New.
+ * wptDNSKeys.cpp (dns_get_pka_record): New.
+ (dns_free_pka_record): New.
+ * PTD.cpp (PTD_delete): Call dns_cleanup().
+
2006-07-25 Timo Schulz <ts at g10code.de>
* wptDNSKeys.cpp: New.
Modified: trunk/PTD/Makefile.am
===================================================================
--- trunk/PTD/Makefile.am 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/PTD/Makefile.am 2006-08-05 10:31:06 UTC (rev 256)
@@ -31,7 +31,7 @@
wptZIP.cpp wptZIP.h \
wptJPG.cpp wptJPG.h \
wptWipeFile.cpp \
- wptDNSKeys.cpp
+ wptDNSKeys.cpp wptDNSKeys.h
PTD_LDADD = $(srcdir)/PTD.def -L../Gnupg -lgnupg $(W32LIBS) \
-lole32 -loleaut32 -lgdi32 -luuid
Modified: trunk/PTD/PTD.def
===================================================================
--- trunk/PTD/PTD.def 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/PTD/PTD.def 2006-08-05 10:31:06 UTC (rev 256)
@@ -9,7 +9,6 @@
PTD_get_curr_hwnd @205
PTD_jpg_show @208
- get_armor_error @212
gpg_use_armor_filter @210
gpg_armor_filter @211
gpg_parse_packet @213
@@ -51,3 +50,5 @@
gpg_md_read @506
gpg_md_selftest @507
+ dns_free_pka_record @600
+ dns_get_pka_record @601
Modified: trunk/PTD/wptDNSKeys.cpp
===================================================================
--- trunk/PTD/wptDNSKeys.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/PTD/wptDNSKeys.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -21,12 +21,18 @@
#include <windows.h>
#include <windns.h>
+#include "wptDNSKeys.h"
+
/* typedef for the function signature. */
typedef DNS_STATUS (*dns_query_fnc) (LPSTR, WORD, DWORD, PIP4_ARRAY,
PDNS_RECORD*, PVOID *);
+
+typedef void (*dns_record_list_free_fnc) (PDNS_RECORD, DNS_FREE_TYPE);
+
/* function pointer. */
static dns_query_fnc dns_query = NULL;
+static dns_record_list_free_fnc dns_record_free = NULL;
/* hinstance handle to the DLL. */
static HINSTANCE dns_api = NULL;
@@ -35,23 +41,7 @@
static int dns_failed = 0;
-/*
-DNS_STATUS WINAPI DnsQuery (
- LPSTR lpstrName, WORD wType,
- DWORD fOptions, PIP4_ARRAY aipServers,
- PDNS_RECORD *ppQueryResultsSet,
- PVOID *pReserved
-);
-*/
-struct pka_info_s {
- int ver;
- char *fpr;
- char *uri;
-};
-typedef struct pka_info_s *pka_info_t;
-
-
/* Initialize the DNS sub system. We do this via dynamic loading
because older NT/9X systems do not have this API. */
static int
@@ -71,9 +61,15 @@
dns_failed = 1;
return -1;
}
+ dns_record_free = (dns_record_list_free_fnc)GetProcAddress (dns_api, "DnsRecordListFree");
+ if (!dns_record_free) {
+ dns_failed = 1;
+ return -1;
+ }
return 0;
}
+
/* Cleanup static structs. */
void
dns_cleanup (void)
@@ -81,22 +77,12 @@
if (dns_api)
FreeLibrary (dns_api);
dns_api = NULL;
+ dns_failed = 0;
}
-/* Release the memory of the @pka structure. */
-void
-dns_free_pka_record (pka_info_t pka)
-{
- if (pka->fpr)
- free (pka->fpr);
- if (pka->uri)
- free (pka->uri);
- free (pka);
-}
-
/* build a DNS name for the PKA lookup. */
static char*
email_get_pka_addr (const char *uid)
@@ -165,7 +151,7 @@
/* Retrieve a PKA record from the DNS.
@userid is used to extract the email address. */
-int
+extern "C" int
dns_get_pka_record (const char *userid, pka_info_t *r_pka)
{
char *addr;
@@ -185,7 +171,19 @@
}
*r_pka = parse_pka_data (rec->Data.Txt.pStringArray[0]);
- //DnsRecordListFree (rec, DnsFreeRecordList);
+ dns_record_free (rec, DnsFreeRecordList);
free (addr);
return 0;
}
+
+
+/* Release the memory of the @pka structure. */
+extern "C" void
+dns_free_pka_record (pka_info_t pka)
+{
+ if (pka->fpr)
+ free (pka->fpr);
+ if (pka->uri)
+ free (pka->uri);
+ free (pka);
+}
Added: trunk/PTD/wptDNSKeys.h
===================================================================
--- trunk/PTD/wptDNSKeys.h 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/PTD/wptDNSKeys.h 2006-08-05 10:31:06 UTC (rev 256)
@@ -0,0 +1,41 @@
+/* wptDNSKeys.h - Support for retrieving keys via DNS
+ * Copyright (C) 2006 Timo Schulz
+ *
+ * This file is part of WinPT.
+ *
+ * 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.
+ *
+ * WinPT is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WinPT; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifndef WPT_DNSKEYS_H
+#define WPT_DNSKEYS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct pka_info_s {
+ int ver;
+ char *fpr;
+ char *uri;
+};
+typedef struct pka_info_s *pka_info_t;
+
+void dns_free_pka_record (pka_info_t pka);
+int dns_get_pka_record (const char *userid, pka_info_t *r_pka);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Po/ChangeLog 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,3 +1,11 @@
+2007-08-05 Timo Schulz <ts at g10code.de>
+
+ * sk.po: Updated by Martin Lukac.
+
+2007-07-30 Timo Schulz <ts at g10code.de>
+
+ * sk.po: New by Martin Lukac.
+
2006-07-25 Timo Schulz <ts at g10code.de>
* de.po: Fixed fuzzy entries due to spelling corrections.
Modified: trunk/Po/LINGUAS
===================================================================
--- trunk/Po/LINGUAS 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Po/LINGUAS 2006-08-05 10:31:06 UTC (rev 256)
@@ -2,6 +2,4 @@
de
jp
pt_BR
-
-
-
+sk
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Po/de.po 2006-08-05 10:31:06 UTC (rev 256)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 1.0.0\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-07-29 12:51+0200\n"
+"POT-Creation-Date: 2006-08-05 12:29+0200\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"
@@ -22,33 +22,41 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Src/WinPT.cpp:188
+#: Src/WinPT.cpp:75
+msgid ""
+"The gpg.conf contains at least one argument which points to a non-existing "
+"file."
+msgstr ""
+"Die gpg.conf Datei enthält mindestens ein Argument das auf einen ungültigen "
+"Dateinamen verweist."
+
+#: Src/WinPT.cpp:195
msgid "Could not create GPG home directory"
msgstr "Konnte Heimatverzeichnis von GPG nicht erstellen"
-#: Src/WinPT.cpp:189 Src/WinPT.cpp:271 Src/WinPT.cpp:275 Src/WinPT.cpp:476
-#: Src/WinPT.cpp:485 Src/WinPT.cpp:492 Src/WinPT.cpp:532 Src/WinPT.cpp:560
-#: Src/WinPT.cpp:569 Src/WinPT.cpp:573 Src/WinPT.cpp:590 Src/WinPT.cpp:658
-#: Src/WinPT.cpp:671 Src/WinPT.cpp:718 Src/WinPT.cpp:748 Src/WinPT.cpp:766
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:912
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:934 Src/wptGPG.cpp:945
-#: Src/wptMainProc.cpp:371 Src/wptMainProc.cpp:544
+#: Src/WinPT.cpp:196 Src/WinPT.cpp:278 Src/WinPT.cpp:282 Src/WinPT.cpp:483
+#: Src/WinPT.cpp:492 Src/WinPT.cpp:499 Src/WinPT.cpp:539 Src/WinPT.cpp:567
+#: Src/WinPT.cpp:576 Src/WinPT.cpp:580 Src/WinPT.cpp:597 Src/WinPT.cpp:665
+#: Src/WinPT.cpp:678 Src/WinPT.cpp:725 Src/WinPT.cpp:760 Src/WinPT.cpp:779
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:926
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:948 Src/wptGPG.cpp:959
+#: Src/wptMainProc.cpp:343 Src/wptMainProc.cpp:516
msgid "WinPT Error"
msgstr "WinPT Fehler"
-#: Src/WinPT.cpp:220
+#: Src/WinPT.cpp:227
msgid "No useable secret key found."
msgstr "Kein benutzbarer geheimer Schlüssel gefunden."
-#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:356 Src/wptKeyPropsDlg.cpp:363
+#: Src/WinPT.cpp:228 Src/wptKeyPropsDlg.cpp:357 Src/wptKeyPropsDlg.cpp:364
msgid "WinPT Warning"
msgstr "WinPT Warnung"
-#: Src/WinPT.cpp:270
+#: Src/WinPT.cpp:277
msgid "Could not read GnuPG version."
msgstr "Konnte Version von GnuPG nicht auslesen."
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:283
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
@@ -57,65 +65,67 @@
"Sorry, Sie benötigen eine neuere Version von GPG.\n"
"Aktuelle Version von GPG %d.%d.%d benötigte Version von GPG "
-#: Src/WinPT.cpp:304
+#: Src/WinPT.cpp:311
msgid "Failed to create WinPT directory"
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
-#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:998 Src/wptKeyserver.cpp:634
+#: Src/WinPT.cpp:312 Src/WinPT.cpp:329 Src/WinPT.cpp:340
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
-#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
-#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
-#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
-#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
-#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
+#: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:364
+#: Src/wptKeyserverDlg.cpp:370 Src/wptKeyserverDlg.cpp:472
+#: Src/wptKeyserverDlg.cpp:532 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:657 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:698 Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:709 Src/wptKeyserverDlg.cpp:715
msgid "Keyserver"
msgstr "Schlüsselserver"
-#: Src/WinPT.cpp:321
+#: Src/WinPT.cpp:328
msgid "Failed to copy the keyserver.conf"
msgstr "Kopieren der keyserver.conf ist fehlgeschlagen"
-#: Src/WinPT.cpp:477
+#: Src/WinPT.cpp:484
#, c-format
msgid ""
"The PTD.dll file has a different version than WinPT.exe\n"
"Please update the PTD.dll to version %d.%d.%d"
msgstr ""
+"Die PTD.dll hat eine andere Version als WinPT.exe\n"
+"Ein Update der PTD.dll auf Version %d.%d.%d ist nötig"
# c:\oss\winpt-gpgme\src\WinPT.cpp:245
-#: Src/WinPT.cpp:484
+#: Src/WinPT.cpp:491
msgid "Cryptographic selftest failed."
msgstr "Kryptographischer Selbsttest ist fehlgeschlagen."
# c:\oss\winpt-gpgme\src\WinPT.cpp:252
-#: Src/WinPT.cpp:491
+#: Src/WinPT.cpp:498
msgid "A newer GPGME version is needed; at least "
msgstr "Eine neuere Version von GPGME wird benötigt; mindestens "
-#: Src/WinPT.cpp:533
+#: Src/WinPT.cpp:540
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
"Please check the GPG registry settings:\n"
"%s."
msgstr ""
-"Das Heimatzverzeichnos von GPG wurde nicht korrekt angegeben.\n"
+"Das Heimatzverzeichnis von GPG wurde nicht korrekt gesetzt.\n"
"Bitte überprüfen Sie die Registryseinträge von GPG:\n"
"%s."
-#: Src/WinPT.cpp:537
+#: Src/WinPT.cpp:544
msgid "Select GPG Public Keyring"
msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
# c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:559
+#: Src/WinPT.cpp:566
msgid "GPG home directory could not be determined."
msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
-#: Src/WinPT.cpp:567
+#: Src/WinPT.cpp:574
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -124,7 +134,7 @@
"Möchten Sie die GPG-Einstellungen öffnen um das Problem zu beheben?"
# c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:582
+#: Src/WinPT.cpp:589
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"
@@ -139,28 +149,28 @@
# 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:615 Src/wptFileManagerDlg.cpp:525
-#: Src/wptFileManagerDlg.cpp:835
+#: Src/WinPT.cpp:622 Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:828
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
-#: Src/WinPT.cpp:657
+#: Src/WinPT.cpp:664
msgid "Could not register window class"
msgstr "Konnte Fensterklasse nicht registrieren"
-#: Src/WinPT.cpp:671
+#: Src/WinPT.cpp:678
msgid "Could not create window"
msgstr "Konnte Fenster nicht erstellen"
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:758
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
msgstr ""
-"Der Schlüsselspeicher wurde nicht initialisiert oder ist leer.\n"
+"Der Schlüsselcache wurde nicht initialisiert oder ist leer.\n"
"Bitte überprüfen Sie die Konfiguration von GPG (Schlüsselbunde, Pfade)"
-#: Src/WinPT.cpp:749
+#: Src/WinPT.cpp:761
msgid ""
"It seems that GPG is not configured properly.\n"
"Do you want to start the GPG preferences dialog?"
@@ -168,7 +178,7 @@
"GPG ist nicht richtig konfiguriert.\n"
"Den GPG-Einstellungsdialog starten?"
-#: Src/WinPT.cpp:767
+#: Src/WinPT.cpp:780
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -191,7 +201,7 @@
msgstr "Über GnuPG"
#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:565
msgid "About WinPT"
msgstr "Über WinPT"
@@ -246,11 +256,11 @@
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "&Help"
msgstr "&Hilfe"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:392
msgid "Card Manager"
msgstr "Kartenmanager"
@@ -274,7 +284,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:291
+#: Src/wptMainProc.cpp:263
msgid "Card Edit"
msgstr "Karten-Editor"
@@ -293,7 +303,7 @@
#: Src/wptCardDlg.cpp:364
#, c-format
msgid "Could not modify card attribute: %s"
-msgstr "Konnte Daten der Carde nicht ändern: %s"
+msgstr "Konnte Attribute auf der Karte nicht ändern: %s"
#: Src/wptCardDlg.cpp:377
msgid "Card attribute changed."
@@ -335,11 +345,11 @@
msgid "&Name"
msgstr "&Name"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "&Kommentar (optional)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "&Ablaufdatum"
@@ -347,23 +357,23 @@
msgid "Off-card passphrase"
msgstr "\"Off-card\" Passwort"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:381
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Niemals"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "E-Mail-&Adresse"
#: Src/wptCardDlg.cpp:586
msgid "Overwrite old keys on the card"
-msgstr "Alte Schlüssel auf der Karte übeerschreiben?"
+msgstr "Alte Schlüssel auf der Karte überschreiben?"
#: Src/wptCardDlg.cpp:587
msgid "Make off-card backup of encryption key"
msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1795
msgid "Card Key Generation"
msgstr "Karten-Schlüsselerzeugung"
@@ -392,7 +402,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Bitte nur den 7-bit ASCII Zeichensatz verwenden."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:457
msgid "The date you have chosen has already passed."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
@@ -455,31 +465,31 @@
"Bitte die OpenPGP-SmartCard einlegen\n"
"OK zum Fortfahren oder Abbrechen"
-#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
+#: Src/wptClipDecryptDlg.cpp:60 Src/wptClipDecryptDlg.cpp:177
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
-#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
+#: Src/wptVerifyList.cpp:257 Src/wptVerifyList.cpp:317
msgid "user ID not found"
msgstr "Benutzerkennung nicht gefunden"
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
msgid "Signature status: created with a fully trusted key"
msgstr "Signatur Status: erstellt mit einem vertraunswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:108
+#: Src/wptClipDecryptDlg.cpp:110
msgid "Signature status: created with a marginal trusted key"
msgstr ""
"Signatur Status: erstellt mit einem teilweise vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:113
msgid "Signature status: created with an UNTRUSTED key"
msgstr "Signatur Status: erstellt mit einem NICHT vertrauenswürdigen Schlüssel"
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:116
msgid "Signature status: created with an undefined trusted key"
msgstr ""
"Signatur Status: erstellt mit einem Schlüssel ohne definiertes Vertrauen"
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:126
#, c-format
msgid ""
"*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -497,7 +507,7 @@
"*** Signatur: %s\r\\n*** Unterzeichner: %s (0x%s)\r\n"
"*** BEGINN PGP ENTSCHLÜSSELTER TEXT ***\r\n"
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:133
msgid ""
"\r\n"
"*** END PGP DECRYPTED TEXT ***"
@@ -505,11 +515,11 @@
"\r\n"
"*** ENDE PGP ENTSCHLÜSSELTER TEXT ***"
-#: Src/wptClipDecryptDlg.cpp:178
+#: Src/wptClipDecryptDlg.cpp:181
msgid "Decrypt Verify"
msgstr "Entschlüsseln/Überprüfen"
-#: Src/wptClipDecryptDlg.cpp:179
+#: Src/wptClipDecryptDlg.cpp:182
#, c-format
msgid ""
"%s\n"
@@ -524,45 +534,45 @@
"Von \"%s\" mit Schlüssel ID 0x%s%s %s\n"
"%s"
-#: Src/wptClipDecryptDlg.cpp:213 Src/wptClipVerifyDlg.cpp:157
-#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
-#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
-#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
-#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
+#: Src/wptClipDecryptDlg.cpp:216 Src/wptClipVerifyDlg.cpp:154
+#: Src/wptClipVerifyDlg.cpp:162 Src/wptClipVerifyDlg.cpp:191
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:220
+#: Src/wptClipVerifyDlg.cpp:232 Src/wptFileManager.cpp:1636
+#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:584
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
-#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
+#: Src/wptMainProc.cpp:206 Src/wptMainProc.cpp:222 Src/wptMainProc.cpp:232
+#: Src/wptMainProc.cpp:401
msgid "Verify"
msgstr "Überprüfen"
-#: Src/wptClipDecryptDlg.cpp:220 Src/wptClipDecryptDlg.cpp:233
-#: Src/wptClipDecryptDlg.cpp:241 Src/wptClipDecryptDlg.cpp:248
-#: Src/wptClipDecryptDlg.cpp:250 Src/wptFileManager.cpp:1343
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptClipDecryptDlg.cpp:251
+#: Src/wptClipDecryptDlg.cpp:253 Src/wptFileManager.cpp:1343
#: Src/wptFileManager.cpp:1394
msgid "Decryption"
msgstr "Entschlüsselung"
-#: Src/wptClipDecryptDlg.cpp:234 Src/wptFileManager.cpp:1395
+#: Src/wptClipDecryptDlg.cpp:237 Src/wptFileManager.cpp:1395
#, c-format
msgid ""
-"Encrypted with %s key, ID %s.%s\n"
+"Encrypted with %s key, ID 0x%s.%s\n"
"Decryption failed: secret key not available."
msgstr ""
-"Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
+"Verschlüsselt mit %s Schlüssel, ID 0x%s.%s\n"
"Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
-#: Src/wptClipDecryptDlg.cpp:241
+#: Src/wptClipDecryptDlg.cpp:244
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Unbekannter Algorithmus: %s"
# c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
-#: Src/wptClipDecryptDlg.cpp:247
+#: Src/wptClipDecryptDlg.cpp:250
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Ungültige OpenPGP Nachricht (vielleicht: \"quoted printable\" im Armorteil)."
-#: Src/wptClipDecryptDlg.cpp:257
+#: Src/wptClipDecryptDlg.cpp:260
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
@@ -575,23 +585,23 @@
"Es ist möglich, dass die Daten beschädigt worden aber es ist ebenfalls "
"möglich das dies ein Teil eines Attacke ist."
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:265
msgid "*** IMPORTANT ***"
msgstr "*** WICHTIG ***"
-#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
-#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:269 Src/wptClipEncryptDlg.cpp:216
+#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:265
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:992 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:994 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
+#: Src/wptMainProc.cpp:191 Src/wptMainProc.cpp:242 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:497 Src/wptMainProc.cpp:502
msgid "Clipboard"
msgstr "Zwischenablage"
@@ -604,7 +614,7 @@
"The file you want to add is very large.\n"
"Continue?"
msgstr ""
-"Die Datei, die Sie hinzufügen wollen, ist sehr groß!\n"
+"Die Datei, die Sie hinzufügen wollen, ist sehr groß.\n"
"Wirklich fortfahren?"
#: Src/wptClipEditDlg.cpp:160
@@ -627,7 +637,7 @@
msgid "&Quote"
msgstr "&Quote"
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:501
msgid "&Open..."
msgstr "Ö&ffnen.."
@@ -636,19 +646,19 @@
msgstr "&Speichern..."
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:422
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:514
msgid "&Paste"
msgstr "&Einfügen"
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:502
msgid "&Encrypt"
msgstr "&Verschlüsseln"
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:504
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:559
msgid "Clipboard Editor"
msgstr "Zwischenablagen-Editor"
@@ -661,39 +671,38 @@
msgid "Recipients unsuable for encryption:\n"
msgstr "Empfänger nicht geeignet für Verschlüsselung:\n"
-#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:155
-#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipEncryptDlg.cpp:212
-#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
-#: Src/wptMainProc.cpp:216
+#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:170
msgid "Encryption"
msgstr "Verschlüsseln"
-#: Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:157
msgid "&Find"
msgstr "&Suche"
-#: Src/wptClipEncryptDlg.cpp:157 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:231
-#: Src/wptFileManagerDlg.cpp:293 Src/wptFileSaveDlg.cpp:59
-#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:166
+#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
+#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:549 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
+#: Src/wptKeyserverDlg.cpp:521 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:94
#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
msgstr "&Abbrechen"
-#: Src/wptClipEncryptDlg.cpp:204 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
msgid "You must select at least one key."
-msgstr "Sie müssen wenigstens einen Schlüssel auswählen."
+msgstr "Sie müssen mindestens einen Schlüssel auswählen."
# c:\oss\winpt-gpgme\src\wptClipEncryptDlg.cpp:229
-#: Src/wptClipEncryptDlg.cpp:241
+#: Src/wptClipEncryptDlg.cpp:240
#, c-format
msgid "No recipient found with '%s'"
msgstr "Keine Empfaenger mit '%s' gefunden"
@@ -702,27 +711,27 @@
msgid "Key Import Statistics"
msgstr "Statistiken für Schlüsselimport"
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:226
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:224
#: Src/wptClipSignEncDlg.cpp:170
msgid "Could not get default key."
msgstr "Konnte den Standardschlüssel nicht finden"
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:111
-#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:153
-#: Src/wptClipSignDlg.cpp:159 Src/wptClipSignDlg.cpp:227
-#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:251
-#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:109
+#: Src/wptClipSignDlg.cpp:117 Src/wptClipSignDlg.cpp:151
+#: Src/wptClipSignDlg.cpp:157 Src/wptClipSignDlg.cpp:225
+#: Src/wptClipSignDlg.cpp:229 Src/wptClipSignDlg.cpp:249
+#: Src/wptClipSignDlg.cpp:260 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
+#: Src/wptMainProc.cpp:177
msgid "Signing"
msgstr "Signieren"
-#: Src/wptClipSignDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:157
msgid "No useable signing key found"
-msgstr "Kein benutzbarer Schlüssel zum Signieren gefunden."
+msgstr "Kein benutzbarer Schlüssel zum Signieren gefunden"
-#: Src/wptClipSignDlg.cpp:232
+#: Src/wptClipSignDlg.cpp:230
#, c-format
msgid ""
"No key was chosen.\n"
@@ -733,7 +742,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
+#: Src/wptMainProc.cpp:184
msgid "Sign & Encrypt"
msgstr "Signieren & Verschlüsseln"
@@ -750,11 +759,11 @@
msgid "No key was selected."
msgstr "Kein Schlüssel ausgewählt."
-#: Src/wptClipVerifyDlg.cpp:140
+#: Src/wptClipVerifyDlg.cpp:139
msgid "Signature Information"
msgstr "Signaturinformationen"
-#: Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipVerifyDlg.cpp:155
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -763,24 +772,24 @@
"Do you want to try to retrieve the key from the keyserver?"
msgstr ""
"Signatur erstellt von %s benutzt %s key ID 0x%s\n"
-"Kann Signatur nicht verifzieren: Öffenlicher Schlüssel nicht vorhanden\n"
+"Kann Signatur nicht verifzieren: öffenlicher Schlüssel nicht vorhanden\n"
"\n"
"Möchten Sie versuchen, den Schlüssel vom Schlüsselserver zu importieren?"
-#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
-#: Src/wptGPGOptDlg.cpp:55
+#: Src/wptClipVerifyDlg.cpp:192 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:57
msgid "&Save"
msgstr "&Speichern"
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:220
msgid "Invalid signature state."
msgstr "Ungültige Signatur."
-#: Src/wptClipVerifyDlg.cpp:236
+#: Src/wptClipVerifyDlg.cpp:231
msgid "Could not extract key or signature information."
msgstr "Konnte Schlüssel- oder Signaturinfos nicht extrahieren."
-#: Src/wptClipVerifyDlg.cpp:272 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:267 Src/wptFileSaveDlg.cpp:58
#: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
#: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
#: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -827,8 +836,8 @@
#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2065
#: Src/wptKeyEditDlgs.cpp:2128 Src/wptKeyEditDlgs.cpp:2142
#: Src/wptKeyEditDlgs.cpp:2157 Src/wptKeyEditDlgs.cpp:2197
-#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
-#: Src/wptKeyManagerDlg.cpp:1929
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1934
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -837,7 +846,7 @@
msgid "Enter preferred keyserver URL"
msgstr "Bevorzugte Keyserver URL eingeben"
-#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:339
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:337
msgid "Choose Locale Directory"
msgstr "Verzeichnis für Sprachdateien auswählen"
@@ -886,11 +895,11 @@
#: Src/wptErrors.cpp:81
msgid "Could not read file"
-msgstr "Konnte Datei nicht einlesen"
+msgstr "Konnte aus Datei nicht lesen"
#: Src/wptErrors.cpp:82
msgid "Could not write file"
-msgstr "Konnte Datei nicht schreiben"
+msgstr "Konnte in Datei nicht schreiben"
#: Src/wptErrors.cpp:83
msgid "Could not close file"
@@ -922,7 +931,7 @@
#: Src/wptErrors.cpp:90
msgid "Could not get Clipboard data"
-msgstr "Konnte Zwischenablage nicht auslesen"
+msgstr "Konnte Daten aus der Zwischenablage nicht lesen"
#: Src/wptErrors.cpp:91
msgid "There is no text in the Clipboard"
@@ -958,7 +967,7 @@
#: Src/wptErrors.cpp:101
msgid "Could not send the key to the keyserver"
-msgstr "Konnte den Schlüssel nicht zum Keyserver senden"
+msgstr "Konnte Schlüssel nicht zum Keyserver senden"
#: Src/wptErrors.cpp:102
msgid "Could not receive the key from the keyserver"
@@ -970,7 +979,7 @@
#: Src/wptErrors.cpp:104
msgid "Keyserver returned: no matching keys in database"
-msgstr "Schlüsselserverantwort: Keine passenden Schlüssel in der Datenbank"
+msgstr "Schlüsselserverantwort: keine passenden Schlüssel in der Datenbank"
#: Src/wptErrors.cpp:105
msgid "Could not register hotkey: "
@@ -1044,9 +1053,9 @@
#: Src/wptFileManager.cpp:880 Src/wptFileManager.cpp:995
#: Src/wptFileManager.cpp:1545 Src/wptFileManager.cpp:1572
#: Src/wptFileManager.cpp:1591 Src/wptFileManager.cpp:1841
-#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:535
-#: Src/wptFileManagerDlg.cpp:638 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:529
+#: Src/wptFileManagerDlg.cpp:631 Src/wptFileStatDlg.cpp:154
+#: Src/wptMainProc.cpp:390 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "Dateimanager"
@@ -1066,7 +1075,7 @@
"Set attribute to normal?"
msgstr ""
"\"%s\" hat Nur-Lesen Attribut.\n"
-"Auf Standard setzen?"
+"Auf Normal Attribut setzen?"
#: Src/wptFileManager.cpp:157
msgid "Could not reset file attribute to normal."
@@ -1087,13 +1096,13 @@
"Möchten Sie die Kompression ausschalten?"
#: Src/wptFileManager.cpp:407 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptVerifyList.cpp:162
+#: Src/wptVerifyList.cpp:169
msgid "Status"
msgstr "Status"
#: Src/wptFileManager.cpp:408 Src/wptKeyEditDlgs.cpp:1156
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:161
+#: Src/wptVerifyList.cpp:168
msgid "Name"
msgstr "Name"
@@ -1112,15 +1121,15 @@
"Do you really want to clearsign it?"
msgstr ""
"\"%s\" scheint keine Text-Datei zu sein.\n"
-"Möchsten Sie wirklich diese Datei signieren?"
+"Möchten Sie wirklich diese Datei signieren?"
#: Src/wptFileManager.cpp:996
#, c-format
msgid "\"%s\" does not exist"
msgstr "\"%s\" existiert nicht"
-#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:273
-#: Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:283
+#: Src/wptFileStatDlg.cpp:287
msgid "File Status"
msgstr "Dateistatus"
@@ -1133,13 +1142,13 @@
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
#: Src/wptFileManager.cpp:1183 Src/wptFileManager.cpp:1495
-#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
+#: Src/wptFileManagerDlg.cpp:582 Src/wptMainProc.cpp:154
+#: Src/wptMainProc.cpp:398 Src/wptMainProc.cpp:405
msgid "Sign"
msgstr "Signieren"
-#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:587
-#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
+#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:580
+#: Src/wptMainProc.cpp:397 Src/wptMainProc.cpp:402
msgid "Encrypt"
msgstr "Verschlüsseln"
@@ -1148,7 +1157,7 @@
msgstr "Symmetrisch verschlüsseln"
#: Src/wptFileManager.cpp:1256 Src/wptFileManager.cpp:1261
-#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:396 Src/wptMainProc.cpp:406
msgid "Symmetric"
msgstr "Symmetrisch"
@@ -1165,7 +1174,7 @@
msgstr "Namen für die Klartext-Datei auswählen"
#: Src/wptFileManager.cpp:1403 Src/wptFileManager.cpp:1423
-#: Src/wptFileManagerDlg.cpp:588
+#: Src/wptFileManagerDlg.cpp:581
msgid "Decrypt"
msgstr "Entschlüsseln"
@@ -1215,11 +1224,11 @@
msgstr "Ungültiger Dateiname. Abbruch"
#: Src/wptFileManager.cpp:1734 Src/wptFileManager.cpp:1745
-#: Src/wptFileManagerDlg.cpp:250 Src/wptImportList.cpp:404
+#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:404
#: Src/wptImportList.cpp:411 Src/wptImportList.cpp:421
#: Src/wptImportList.cpp:429 Src/wptImportList.cpp:438
#: Src/wptKeyManager.cpp:478 Src/wptKeyManager.cpp:489
-#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:222
msgid "Import"
msgstr "Importieren"
@@ -1254,7 +1263,7 @@
#: Src/wptKeyEditDlgs.cpp:1314 Src/wptKeyEditDlgs.cpp:1386
#: Src/wptKeyserverDlg.cpp:104
msgid "GnuPG status"
-msgstr "GnuPG Status"
+msgstr "GnuPG-Status"
#: Src/wptFileManager.cpp:1796
#, c-format
@@ -1274,27 +1283,27 @@
msgid "Choose File Name for Output"
msgstr "Wählen Sie einen Namen für die Ausgabedatei"
-#: Src/wptFileManager.cpp:1977
+#: Src/wptFileManager.cpp:1978
msgid "Choose a Name for the Archive"
msgstr "Wählen Sie den Namen für das Archiv"
-#: Src/wptFileManager.cpp:1980
+#: Src/wptFileManager.cpp:1981
msgid "Invalid archive name. Exit."
msgstr "Ungültiger Archivename. Abbruch."
-#: Src/wptFileManager.cpp:1981 Src/wptFileManager.cpp:1989
+#: Src/wptFileManager.cpp:1982 Src/wptFileManager.cpp:1990
msgid "Encrypt Directory"
msgstr "Verzeichnis verschlüsseln"
-#: Src/wptFileManager.cpp:1988
+#: Src/wptFileManager.cpp:1989
msgid "Could not create zip archive."
msgstr "Konnte ZIP-Datei nicht erstellen."
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:159
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
msgid "File Encrypt"
msgstr "Datei verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
msgid "&Text Output"
msgstr "&Textausgabe"
@@ -1310,36 +1319,35 @@
msgid "&Select Key for signing"
msgstr "&Schlüssel zum Signieren"
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:292
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
msgid "Options"
msgstr "Optionen"
-#: Src/wptFileManagerDlg.cpp:158
+#: Src/wptFileManagerDlg.cpp:152
msgid "Please select at least one recipient."
msgstr "Bitte wählen Sie wenigstens einen Empfänger."
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:283
#: Src/wptKeyManager.cpp:442
msgid "No valid OpenPGP data found."
msgstr "Keine gültigen OpenPGP-Daten gefunden."
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileManagerDlg.cpp:230
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
#: Src/wptKeyManager.cpp:467
msgid "Key Import"
msgstr "Schlüsselimport"
-#: Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:216
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr "%s enthält %d Schlüssel."
-#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:498
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
-#: Src/wptFileManagerDlg.cpp:247
+#: Src/wptFileManagerDlg.cpp:242
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1351,165 +1359,165 @@
"Die Vertrauensstellungen dieser Schlüssel müssen Sie\n"
"manuell in den Schlüsseleigenschaften setzen."
-#: Src/wptFileManagerDlg.cpp:286 Src/wptFileManagerDlg.cpp:338
+#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
msgid "File Sign"
msgstr "Datei signieren"
-#: Src/wptFileManagerDlg.cpp:288
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Normal Signature"
msgstr "&Normale Signatur"
-#: Src/wptFileManagerDlg.cpp:289
+#: Src/wptFileManagerDlg.cpp:284
msgid "&Detached Signature"
msgstr "&Angehängte Signatur"
-#: Src/wptFileManagerDlg.cpp:290
+#: Src/wptFileManagerDlg.cpp:285
msgid "&Cleartext Signature"
msgstr "&Klartextsignatur"
-#: Src/wptFileManagerDlg.cpp:291
+#: Src/wptFileManagerDlg.cpp:286
msgid "Signature mode"
msgstr "Signaturmodus"
-#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
#: Src/wptKeyManager.cpp:722 Src/wptKeyManager.cpp:823
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManagerDlg.cpp:1678
-#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1688 Src/wptKeyManagerDlg.cpp:1716
+#: Src/wptKeyManagerDlg.cpp:1727 Src/wptKeyManagerDlg.cpp:1742
#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
-#: Src/wptFileManagerDlg.cpp:399
+#: Src/wptFileManagerDlg.cpp:387
msgid "0 Objects marked"
msgstr "0 Objekte markiert"
-#: Src/wptFileManagerDlg.cpp:403
+#: Src/wptFileManagerDlg.cpp:391
#, c-format
msgid "%d Object(s) marked"
msgstr "%d Objekt(e) markiert"
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
+#: Src/wptFileManagerDlg.cpp:495 Src/wptMainProc.cpp:529
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
-#: Src/wptMainProc.cpp:421
+#: Src/wptFileManagerDlg.cpp:499 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptMainProc.cpp:393
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
+#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:968
msgid "View"
msgstr "Ansicht"
-#: Src/wptFileManagerDlg.cpp:509 Src/wptFileManagerDlg.cpp:586
+#: Src/wptFileManagerDlg.cpp:503 Src/wptFileManagerDlg.cpp:579
msgid "Encrypt into ZIP"
msgstr "Verschlüsseln in ZIP"
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Sign"
msgstr "&Signieren"
-#: Src/wptFileManagerDlg.cpp:512 Src/wptFileManagerDlg.cpp:590
-#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
+#: Src/wptFileManagerDlg.cpp:506 Src/wptFileManagerDlg.cpp:583
+#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:403
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:507
msgid "&Verify"
msgstr "Über&prüfen"
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:508
msgid "S&ymmetric"
msgstr "S&ymmetrisch"
-#: Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:509
msgid "&Import"
msgstr "&Importieren"
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:510
msgid "E&xport"
msgstr "E&xportieren"
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
+#: Src/wptFileManagerDlg.cpp:511 Src/wptMainProc.cpp:395
msgid "Exit"
msgstr "Beenden"
-#: Src/wptFileManagerDlg.cpp:518
+#: Src/wptFileManagerDlg.cpp:512
msgid "&Reset"
msgstr "&Reset"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:421
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:513
msgid "Always on Top"
msgstr "Immer im Vordergrund"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:423
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:515
msgid "&Select All"
msgstr "Alles &markieren"
-#: Src/wptFileManagerDlg.cpp:522
+#: Src/wptFileManagerDlg.cpp:516
msgid "&Preferences"
msgstr "&Einstellungen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptFileManagerDlg.cpp:523 Src/wptFileManagerDlg.cpp:593
+#: Src/wptFileManagerDlg.cpp:517 Src/wptFileManagerDlg.cpp:586
msgid "Send as Mail"
msgstr "Als Mail versenden"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:425
-#: Src/wptFileManagerDlg.cpp:524
+#: Src/wptFileManagerDlg.cpp:518
msgid "&List Packets"
msgstr "Pakete an&zeigen"
-#: Src/wptFileManagerDlg.cpp:526
+#: Src/wptFileManagerDlg.cpp:520
msgid "&Wipe"
msgstr "&Löschen"
-#: Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:585
msgid "Wipe"
msgstr "Löschen"
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:587
msgid "List Packets"
msgstr "Pakete anzeigen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:429
-#: Src/wptFileManagerDlg.cpp:626
+#: Src/wptFileManagerDlg.cpp:619
msgid "&Calc Digest"
msgstr "Digest &berechnen"
-#: Src/wptFileManagerDlg.cpp:637
+#: Src/wptFileManagerDlg.cpp:630
msgid "This command requires admin privileges.\n"
msgstr "Dieses Kommando benötigt Adminrechte.\n"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
-#: Src/wptFileManagerDlg.cpp:787
+#: Src/wptFileManagerDlg.cpp:780
msgid "Are you sure you want to secure delete these files?"
msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
-#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
+#: Src/wptFileManagerDlg.cpp:781 Src/wptMainProc.cpp:108
msgid "&Yes"
msgstr "&Ja"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:782 Src/wptMainProc.cpp:109
msgid "&No"
msgstr "&Nein"
-#: Src/wptFileManagerDlg.cpp:832
+#: Src/wptFileManagerDlg.cpp:825
msgid "Operation Status: Error"
msgstr "Prozess-Status: Fehler"
-#: Src/wptFileManagerDlg.cpp:833
+#: Src/wptFileManagerDlg.cpp:826
msgid "Operation Status: Done."
msgstr "Prozess-Status: Fertig."
-#: Src/wptFileManagerDlg.cpp:876
+#: Src/wptFileManagerDlg.cpp:869
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1562,14 +1570,14 @@
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:43
#: Src/wptFirstRunDlg.cpp:46
msgid "&Copy GnuPG keyrings from another location"
-msgstr "GPG Keyring aus anderem Verzeichnis &kopieren"
+msgstr "GPG Schlüsselbund aus anderem Verzeichnis &kopieren"
#: Src/wptFirstRunDlg.cpp:48
msgid "WinPT First Start"
msgstr "WinPT Erster Start"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:728
-#: Src/wptGPG.cpp:830
+#: Src/wptGPG.cpp:844
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1579,19 +1587,19 @@
"In diesem Zustand kann nichts gespeichert werden\n"
"Wollen Sie das Attribut zurücksetzen?"
-#: Src/wptGPG.cpp:833
+#: Src/wptGPG.cpp:847
msgid "GPG Information"
msgstr "GPG Information"
-#: Src/wptGPG.cpp:837
+#: Src/wptGPG.cpp:851
msgid "Could not reset read-only state."
msgstr "Konnte den Nur-Lesen Zustand nicht zurücksetzen."
-#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
+#: Src/wptGPG.cpp:852
msgid "GPG Error"
msgstr "GPG Fehler"
-#: Src/wptGPG.cpp:850
+#: Src/wptGPG.cpp:864
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1605,23 +1613,22 @@
"Die Schlüsselbunde sind im Nur-Lesen-Modus, was meistens der Fall ist, \n"
"wenn ein anderes Programm auf die Schlüsselbunde zugreift.\n"
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:869
msgid "GPG Warning"
msgstr "GPG Warnung"
-#: Src/wptGPG.cpp:879 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
-#: Src/wptGPGPrefsDlg.cpp:232 Src/wptGPGPrefsDlg.cpp:238
-#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:248
-#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:268
-#: Src/wptKeyEditDlgs.cpp:1713 Src/wptKeyManagerDlg.cpp:997
-#: Src/wptMainProc.cpp:444 Src/wptPreferencesDlg.cpp:225
-#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
-#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
-#: Src/wptRegistry.cpp:596
+#: Src/wptGPG.cpp:893 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
+#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
+#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
+#: Src/wptKeyEditDlgs.cpp:1713 Src/wptMainProc.cpp:416
+#: Src/wptPreferencesDlg.cpp:225 Src/wptPreferencesDlg.cpp:270
+#: Src/wptPreferencesDlg.cpp:282 Src/wptPreferencesDlg.cpp:295
+#: Src/wptPreferencesDlg.cpp:326 Src/wptRegistry.cpp:596
msgid "Preferences"
msgstr "Einstellungen"
-#: Src/wptGPG.cpp:880
+#: Src/wptGPG.cpp:894
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1630,41 +1637,41 @@
"%s existiert nicht.\n"
"Möchten Sie dieses Verzeichnis erstellen?"
-#: Src/wptGPG.cpp:908
+#: Src/wptGPG.cpp:922
msgid "Please choose your Public Keyring"
msgstr "Bitte wählen Sie Ihren öffentlichen Schlüsselbund."
-#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:925 Src/wptGPG.cpp:947
msgid "No keyring was chosen. Exit."
msgstr "Kein Schlüsselbund ausgewählt. Abbruch."
-#: Src/wptGPG.cpp:918
+#: Src/wptGPG.cpp:932
msgid "Overwrite old public keyring?"
msgstr "Alten öff. Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:959
msgid "Could not copy file."
msgstr "Datei konnte nicht kopiert werden"
-#: Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:944
msgid "Please choose your Secret Keyring"
msgstr "Bitte wählen Sie Ihren geheimen Schlüsselbund"
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:953
msgid "Overwrite old secret keyring?"
msgstr "Alten geheimen Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:999 Src/wptGPG.cpp:1088 Src/wptGPG.cpp:1101
msgid "Backup"
msgstr "Sicherung"
-#: Src/wptGPG.cpp:989
+#: Src/wptGPG.cpp:999
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Schlüsselbundsicherung \"%s\" fehlgeschlagen"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:1021
-#: Src/wptGPG.cpp:1079
+#: Src/wptGPG.cpp:1089
#, c-format
msgid ""
"The backup drive '%s' does not seems to be accessable.\n"
@@ -1673,15 +1680,11 @@
"Kann auf das Backup-Laufwerk '%s' nicht zugreifen.\n"
"Bitte aktivieren/überprüfen sie das Laufwerk um Fortzufahren."
-#: Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:1101
#, c-format
msgid "Invalid backup mode %d"
msgstr "Ungültiger Sicherungsmethode %d"
-#: Src/wptGPG.cpp:1118
-msgid "No GPG error description available."
-msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
-
#: Src/wptGPGME.cpp:278
msgid "Error during verification process"
msgstr "Fehler während Verifikation"
@@ -1714,46 +1717,46 @@
msgid "Good Signature (Revoked Key)"
msgstr "Gültige Signatur (Widerrufener Schlüssel)"
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:50 Src/wptGPGOptDlg.cpp:100
msgid "Could not load GnuPG config file!"
msgstr "Konnte GnuPG Konfigurationsdatei nicht laden!"
-#: Src/wptGPGOptDlg.cpp:49 Src/wptGPGOptDlg.cpp:70 Src/wptGPGOptDlg.cpp:76
-#: Src/wptGPGOptDlg.cpp:81 Src/wptGPGOptDlg.cpp:85 Src/wptGPGOptDlg.cpp:92
-#: Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:51 Src/wptGPGOptDlg.cpp:72 Src/wptGPGOptDlg.cpp:78
+#: Src/wptGPGOptDlg.cpp:83 Src/wptGPGOptDlg.cpp:87 Src/wptGPGOptDlg.cpp:94
+#: Src/wptGPGOptDlg.cpp:100
msgid "GPG Config"
msgstr "GPG Konfiguration"
# c:\oss\winpt-gpgme\src\wptGPGOptDlg.cpp:47
-#: Src/wptGPGOptDlg.cpp:54
+#: Src/wptGPGOptDlg.cpp:56
msgid "GnuPG Configuration File"
msgstr "GnuPG Konfigurationsdatei"
-#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+#: Src/wptGPGOptDlg.cpp:58 Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "&Laden"
-#: Src/wptGPGOptDlg.cpp:57
+#: Src/wptGPGOptDlg.cpp:59
msgid "&Exit"
msgstr "&Beenden"
-#: Src/wptGPGOptDlg.cpp:70
+#: Src/wptGPGOptDlg.cpp:72
msgid "The 'gpg.conf' file is not loaded."
msgstr "Die 'gpg.conf' wurde nicht geladen"
-#: Src/wptGPGOptDlg.cpp:76
+#: Src/wptGPGOptDlg.cpp:78
msgid "File contains invalid GnuPG keywords!"
msgstr "Datei enthält ungültige GnuPG-Schlüsselwörter!"
-#: Src/wptGPGOptDlg.cpp:81
+#: Src/wptGPGOptDlg.cpp:83
msgid "Could not save GnuPG config file."
msgstr "Konnte GnuPG Konfigurationsdatei nicht speichern."
-#: Src/wptGPGOptDlg.cpp:85
+#: Src/wptGPGOptDlg.cpp:87
msgid "Successfully saved."
msgstr "Erfolgreich gespeichert."
-#: Src/wptGPGOptDlg.cpp:91
+#: Src/wptGPGOptDlg.cpp:93
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -1761,82 +1764,82 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
-#: Src/wptMainProc.cpp:605
+#: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:577
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
-#: Src/wptGPGPrefsDlg.cpp:152
+#: Src/wptGPGPrefsDlg.cpp:154
msgid "GnuPG home directory (where both keyrings are located)"
msgstr "GnuPG Heimatverzeichnis (wo sich die Keyrings befinden)"
-#: Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "GnuPG exe file location (full path with added gpg.exe)"
msgstr "Vollständige Pfadangabe für GPG.EXE"
-#: Src/wptGPGPrefsDlg.cpp:156
+#: Src/wptGPGPrefsDlg.cpp:158
msgid "Locale directory (to access the translation files)"
msgstr "Verzeichnis der Sprachdateien"
-#: Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptGPGPrefsDlg.cpp:159
msgid "Ask for the signature class during key sign"
msgstr "Signaturlevel erfragen während Schlüsselsignierung"
-#: Src/wptGPGPrefsDlg.cpp:158
+#: Src/wptGPGPrefsDlg.cpp:160
msgid "Allow to set an expiration date for signatures"
msgstr "Erlaube ein Ablaufdatum für Signaturen zu setzen"
-#: Src/wptGPGPrefsDlg.cpp:159
+#: Src/wptGPGPrefsDlg.cpp:161
msgid "Comment in armored files"
msgstr "Kommentar in Armor-Dateien"
-#: Src/wptGPGPrefsDlg.cpp:160
+#: Src/wptGPGPrefsDlg.cpp:162
msgid "Encrypt to this key"
msgstr "Mit diesem Schlüssel verschlüsseln"
-#: Src/wptGPGPrefsDlg.cpp:161
+#: Src/wptGPGPrefsDlg.cpp:163
msgid "General GPG options"
msgstr "Allgemeine GPG-Optionen"
-#: Src/wptGPGPrefsDlg.cpp:162 Src/wptGPGPrefsDlg.cpp:163
-#: Src/wptGPGPrefsDlg.cpp:164 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:164 Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:166 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr "Ändern..."
-#: Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:167
msgid "&Overwrite default settings"
msgstr "&Überschreibe Voreinstellungen"
-#: Src/wptGPGPrefsDlg.cpp:219
+#: Src/wptGPGPrefsDlg.cpp:221
msgid "Please enter the GnuPG home directory."
msgstr "Bitte geben Sie das GnuPG-Heimatverzeichnis ein."
-#: Src/wptGPGPrefsDlg.cpp:231
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Could not save 'HomeDir' in the registry."
msgstr "Konnte 'Heinmatverzeichnis' nicht in der Registrierung speichern."
-#: Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:239
msgid "Please enter where GPG.exe is located."
msgstr "Bitte geben Sie den Pfad zu GPG.EXE ein."
-#: Src/wptGPGPrefsDlg.cpp:242
+#: Src/wptGPGPrefsDlg.cpp:244
msgid "Could not find the GPG program in this directory."
msgstr "Konnte GPG-Programm nicht in diesem Verzeichnis finden."
-#: Src/wptGPGPrefsDlg.cpp:247
+#: Src/wptGPGPrefsDlg.cpp:249
msgid "Could not save 'gpgProgram' in the registry"
msgstr "Konnte 'gpgProgram' nicht in der Registrierung speichern."
-#: Src/wptGPGPrefsDlg.cpp:267
+#: Src/wptGPGPrefsDlg.cpp:269
msgid "Could not get GPG config file"
msgstr "Konnte Konfigurationsdatei von GPG nicht öffnen"
-#: Src/wptGPGPrefsDlg.cpp:317
+#: Src/wptGPGPrefsDlg.cpp:319
msgid "Choose GPG Home Directory"
msgstr "Heimatverzeichnis von GPG auswählen"
-#: Src/wptGPGPrefsDlg.cpp:345
+#: Src/wptGPGPrefsDlg.cpp:343
msgid "Choose GPG Binary"
msgstr "Wählen Sie GPG.EXE Datei aus"
@@ -1855,23 +1858,23 @@
#: Src/wptKeyManager.cpp:750 Src/wptKeyManager.cpp:759
#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:796
#: Src/wptKeyManager.cpp:823 Src/wptKeyManager.cpp:828
-#: Src/wptKeyManager.cpp:852 Src/wptKeyManager.cpp:857
-#: Src/wptKeyManager.cpp:871 Src/wptKeyManager.cpp:928
-#: Src/wptKeyManager.cpp:933 Src/wptKeyManager.cpp:990
-#: Src/wptKeyManager.cpp:1023 Src/wptKeyManager.cpp:1107
-#: Src/wptKeyManagerDlg.cpp:1326 Src/wptKeyManagerDlg.cpp:1337
-#: Src/wptKeyManagerDlg.cpp:1347 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1694
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1712
-#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1733
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1765
-#: Src/wptKeyManagerDlg.cpp:1797 Src/wptKeyManagerDlg.cpp:1856
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:930
+#: Src/wptKeyManager.cpp:935 Src/wptKeyManager.cpp:992
+#: Src/wptKeyManager.cpp:1025 Src/wptKeyManager.cpp:1109
+#: Src/wptKeyManagerDlg.cpp:1324 Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1345 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptKeyManagerDlg.cpp:1673 Src/wptKeyManagerDlg.cpp:1688
+#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1706
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyManagerDlg.cpp:1759
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1856
#: Src/wptKeyManagerDlg.cpp:1874 Src/wptKeyManagerDlg.cpp:1879
-#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1955
-#: Src/wptKeyManagerDlg.cpp:1960 Src/wptKeyManagerDlg.cpp:2074
-#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
-#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1960
+#: Src/wptKeyManagerDlg.cpp:1965 Src/wptKeyManagerDlg.cpp:2079
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
+#: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
+#: Src/wptMainProc.cpp:391 Src/wptMainProc.cpp:540 Src/wptMainProc.cpp:548
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1882,7 +1885,7 @@
"\n"
"%s"
msgstr ""
-"Diesen Gruppe wirklich löschen?\n"
+"Diese Gruppe wirklich löschen?\n"
"\n"
"%s"
@@ -1951,15 +1954,15 @@
#: Src/wptKeyEditDlgs.cpp:1483 Src/wptKeyEditDlgs.cpp:1514
#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1758
#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
-#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
-#: Src/wptKeysigDlg.cpp:207
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
+#: Src/wptKeysigDlg.cpp:215
msgid "Revoked"
msgstr "Widerrufen"
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:259
#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1346
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
+#: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
msgid "Expired"
msgstr "Abgelaufen"
@@ -1976,34 +1979,34 @@
msgstr "Ungültige Benutzerkennung"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:166
+#: Src/wptVerifyList.cpp:173
msgid "User ID"
msgstr "Benutzerkennung"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "Größe"
#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1072
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
-#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:172
msgid "Key ID"
msgstr "Schlüssel-ID"
#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1073
#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Erstellung"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
msgid "Type"
msgstr "Typ"
@@ -2017,13 +2020,13 @@
"und deshalb ein CRC Fehler auftrat."
# c:\oss\winpt-gpgme\src\wptKeyCache.cpp:479
-#: Src/wptKeyCache.cpp:813
+#: Src/wptKeyCache.cpp:818
msgid "Load GPG Keyrings..."
msgstr "Lade GPG Schlüsselbunde..."
#: Src/wptKeyCacheDlg.cpp:54
msgid "WinPT Key Caching"
-msgstr "WinPT Schlüssel Caching"
+msgstr "WinPT Schlüssel-Caching"
#: Src/wptKeyCacheDlg.cpp:57
msgid "Caching keyrings, please wait..."
@@ -2080,7 +2083,7 @@
"Das Bild muss eine JPEG Datei sein."
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:361
msgid "Passphrase"
msgstr "Passwort"
@@ -2101,7 +2104,7 @@
#: Src/wptKeyEditDlgs.cpp:372
#, c-format
msgid "'%s' is not a valid JPEG file."
-msgstr "'%s' is keine gültige JPEG Datei."
+msgstr "'%s' ist keine gültige JPEG Datei."
#: Src/wptKeyEditDlgs.cpp:381 Src/wptKeyRevokeDlg.cpp:166
msgid "Please enter a file name."
@@ -2123,8 +2126,8 @@
#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:722
#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1516
#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
-#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:380
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "GnuPG-Status"
@@ -2190,7 +2193,7 @@
#: Src/wptKeyEditDlgs.cpp:535
msgid "Invalid email address."
-msgstr "Ungültige E-Mail-Adresse"
+msgstr "Ungültige E-Mail-Adresse."
#: Src/wptKeyEditDlgs.cpp:551
msgid "user ID successfully added."
@@ -2233,7 +2236,7 @@
#: Src/wptKeyEditDlgs.cpp:898 Src/wptKeyEditDlgs.cpp:930
#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1334
#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1467
-#: Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:1705
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
@@ -2246,7 +2249,7 @@
msgstr "Bevorzugter Keyserver wurde erfolgreich gesetzt."
#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:370
+#: Src/wptKeyPropsDlg.cpp:371
msgid "Change Ownertrust"
msgstr "Besitzervertrauen ändern"
@@ -2286,7 +2289,7 @@
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Beschreibung"
@@ -2295,7 +2298,7 @@
msgstr "Verfällt"
#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "Gültigkeit"
@@ -2523,7 +2526,7 @@
msgid "Do you really want to make this sig exportable?"
msgstr "Wollen Sie diese Signatur wirklich exportierbar machen?"
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:466
msgid "Key successfully signed."
msgstr "Schlüssel erfolgreich signiert."
@@ -2556,7 +2559,7 @@
msgid "Command>"
msgstr "Kommando>"
-#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:589
#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Schliessen"
@@ -2608,8 +2611,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
-#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:1926 Src/wptKeyPropsDlg.cpp:286
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2627,17 +2630,17 @@
msgid "Key Generation - Progress Dialog"
msgstr "Schlüsselerzeugung - Fortschrittsdialog"
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
-#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:416 Src/wptKeygenDlg.cpp:421
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:438
-#: Src/wptKeygenDlg.cpp:446 Src/wptKeygenDlg.cpp:460 Src/wptKeygenDlg.cpp:467
-#: Src/wptKeygenDlg.cpp:477 Src/wptKeygenDlg.cpp:498 Src/wptKeygenDlg.cpp:581
-#: Src/wptKeyManagerDlg.cpp:1788 Src/wptPassphraseDlg.cpp:147
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:296 Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:414 Src/wptKeygenDlg.cpp:419
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
+#: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
+#: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptPassphraseDlg.cpp:147
#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
-#: Src/wptKeygenDlg.cpp:286
+#: Src/wptKeygenDlg.cpp:284
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -2655,48 +2658,48 @@
"\n"
"Backup der Schlüsselbunde erstellen?"
-#: Src/wptKeygenDlg.cpp:291
+#: Src/wptKeygenDlg.cpp:289
msgid "WARNING - Important hint"
msgstr "WARNUNG - Wichtiger Hinweis"
-#: Src/wptKeygenDlg.cpp:293
+#: Src/wptKeygenDlg.cpp:291
msgid "Destination for Public Keyring"
msgstr "Speicherort für öff. Schlüsselbund"
-#: Src/wptKeygenDlg.cpp:299 Src/wptKeygenDlg.cpp:308
+#: Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
#, c-format
msgid "Could not copy %s -> %s"
msgstr "Konnte %s nicht -> %s kopieren"
-#: Src/wptKeygenDlg.cpp:302
+#: Src/wptKeygenDlg.cpp:300
msgid "Destination for Secret Keyring"
msgstr "Speicherort für geheimen Schlüsselbund"
-#: Src/wptKeygenDlg.cpp:324
+#: Src/wptKeygenDlg.cpp:322
msgid "DSA and ELG (default)"
msgstr "DSA und ELG (Standard)"
-#: Src/wptKeygenDlg.cpp:325
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and RSA"
msgstr "DSA und RSA"
-#: Src/wptKeygenDlg.cpp:326
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA sign only"
msgstr "DSA nur signieren"
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:325
msgid "RSA sign only"
msgstr "RSA nur signieren"
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign and encrypt"
msgstr "RSA signieren + verschlüsseln"
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA and RSA (PGP)"
msgstr "RSA und RSA (PGP)"
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:371
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
"message that key generation has finished."
@@ -2704,70 +2707,70 @@
"Die Schlüsselerstellung kann eine Weile dauern! Bitte warten Sie, bis eine "
"Meldung über die Beendigung der Schlüsselerzeugung erscheint."
-#: Src/wptKeygenDlg.cpp:375
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr "&Schlüsselgröße in Bits"
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "&Ihr Name"
-#: Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr "Schlüssel &Typ"
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:413
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Ungültige Eingabe. Erlaubte Werte sind 1024-4096 Bit."
-#: Src/wptKeygenDlg.cpp:420
+#: Src/wptKeygenDlg.cpp:418
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:556
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
+#: Src/wptKeygenDlg.cpp:428 Src/wptKeygenDlg.cpp:561
msgid "Please do not enter the email address in the name field."
msgstr "Bitte geben Sie nicht die E-Mail-Adresse im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:568
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
-#: Src/wptKeygenDlg.cpp:445
+#: Src/wptKeygenDlg.cpp:443
msgid "Please do NOT enter the email address in the comment field."
msgstr "Bitte geben Sie die E-Mail-Adresse NICHT im Kommentarfeld ein."
-#: Src/wptKeygenDlg.cpp:476 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:474 Src/wptKeyRevokeDlg.cpp:180
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeygenDlg.cpp:499 Src/wptKeygenDlg.cpp:600
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:540
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:541
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:542
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:543
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:546
+#: Src/wptKeygenDlg.cpp:544
msgid ""
"Every key pair must have a name associated with it. The name and\n"
"email address let your correspondents know that your public key they\n"
@@ -2778,7 +2781,7 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:545
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -2789,13 +2792,13 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
-#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:598
-#: Src/wptKeyManagerDlg.cpp:1811
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeygenDlg.cpp:557 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:569 Src/wptKeygenDlg.cpp:575 Src/wptKeygenDlg.cpp:596
+#: Src/wptKeyManagerDlg.cpp:1805
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:576
+#: Src/wptKeygenDlg.cpp:574
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2880,17 +2883,17 @@
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1005
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
-#: Src/wptVerifyList.cpp:164
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:171
msgid "Trust"
msgstr "Vertrauen"
-#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:125
msgid "Invalid User ID"
msgstr "Ungültige Benutzerkennung"
@@ -3060,50 +3063,50 @@
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "Wollen Sie '0x%s' wirklich zum Schlüsselserver %s senden?"
-#: Src/wptKeyManager.cpp:851
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:929
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:932
+#: Src/wptKeyManager.cpp:934
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:1018
+#: Src/wptKeyManager.cpp:1020
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
-#: Src/wptKeyManager.cpp:1084 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. Kein Grund angeben"
-#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:86
msgid "1. Key has been compromised"
msgstr "1. Der Schlüssel ist nicht mehr sicher"
-#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1088 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. Der Schlüssel ist veraltet"
-#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1089 Src/wptKeyRevokeDlg.cpp:88
msgid "3. Key is no longer used"
msgstr "3. Der Schlüssel wird nicht mehr benutzt"
-#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1026
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
@@ -3117,207 +3120,219 @@
msgid "Default Key: 0x%s"
msgstr "Standardschlüssel: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:532
+#: Src/wptKeyManagerDlg.cpp:529
#, c-format
msgid "%d secret keys"
-msgstr "%d geheime Schlüssel"
+msgstr "%d geheime(r) Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:533
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:969
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
+#: Src/wptKeyManagerDlg.cpp:970 Src/wptKeyManagerDlg.cpp:1361
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:973
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:976
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:978
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1033
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1029
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
+#: Src/wptKeyManagerDlg.cpp:989 Src/wptKeyManagerDlg.cpp:1722
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
-#: Src/wptKeysigDlg.cpp:419
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:993
+msgid "GPG &Options"
+msgstr "GnuPG-Optionen"
+
+#: Src/wptKeyManagerDlg.cpp:994
+msgid "&GPG Preferences"
+msgstr "GnuPG-Einstellungen"
+
+#: Src/wptKeyManagerDlg.cpp:995
+msgid "&WinPT Preferences"
+msgstr "WinPT-Einstellungen"
+
+#: Src/wptKeyManagerDlg.cpp:997
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:999
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1001 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Copy E-Mail to Clipboard"
msgstr "Kopiere E-Mail in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1028
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1043
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:1047
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Revoker..."
msgstr "Widerrufer..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1050
+#: Src/wptKeyManagerDlg.cpp:1048
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1051
+#: Src/wptKeyManagerDlg.cpp:1049
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:1052
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1333
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3325,75 +3340,79 @@
"Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
"Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
-#: Src/wptKeyManagerDlg.cpp:1364
+#: Src/wptKeyManagerDlg.cpp:1362
msgid "&Show"
msgstr "&Anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1365
+#: Src/wptKeyManagerDlg.cpp:1363
msgid "&New..."
msgstr "&Neu..."
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1475
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1479
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1483
msgid "Delete key from keyring"
-msgstr "Schlüssel aus Keyring löschen"
+msgstr "Schlüssel aus Schlüsselbund löschen"
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1487
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1491
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1497
+#: Src/wptKeyManagerDlg.cpp:1495
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1501
+#: Src/wptKeyManagerDlg.cpp:1499
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1505
+#: Src/wptKeyManagerDlg.cpp:1503
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1509
+#: Src/wptKeyManagerDlg.cpp:1507
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1643
+#: Src/wptKeyManagerDlg.cpp:1641
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1655
+#: Src/wptKeyManagerDlg.cpp:1643
+msgid "Preferences..."
+msgstr "Einstellungen..."
+
+#: Src/wptKeyManagerDlg.cpp:1649
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1687 Src/wptKeysignDlg.cpp:325
-#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
-#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
-#: Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeysignDlg.cpp:351
+#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
+#: Src/wptKeysignDlg.cpp:456 Src/wptKeysignDlg.cpp:461
+#: Src/wptKeysignDlg.cpp:466
msgid "Key Signing"
msgstr "Schlüsselsignierung"
-#: Src/wptKeyManagerDlg.cpp:1703
+#: Src/wptKeyManagerDlg.cpp:1697
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1717 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyRevokeDlg.cpp:68
#: Src/wptKeyRevokeDlg.cpp:78 Src/wptKeyRevokeDlg.cpp:162
#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:172
#: Src/wptKeyRevokeDlg.cpp:181 Src/wptKeyRevokeDlg.cpp:191
@@ -3401,15 +3420,15 @@
msgid "Key Revocation Cert"
msgstr "Schlüsselwiderruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:1739
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1750 Src/wptKeyPropsDlg.cpp:282
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1766
+#: Src/wptKeyManagerDlg.cpp:1760
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3418,14 +3437,19 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1796
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1813 Src/wptKeyserverDlg.cpp:580
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
+#: Src/wptKeyManagerDlg.cpp:1821 Src/wptMainProc.cpp:571
+#: Src/wptPreferencesDlg.cpp:139
+msgid "WinPT Preferences"
+msgstr "WinPT Einstellungen"
+
#: Src/wptKeyManagerDlg.cpp:1836
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
@@ -3460,11 +3484,11 @@
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1954
+#: Src/wptKeyManagerDlg.cpp:1959
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
-#: Src/wptKeyManagerDlg.cpp:1959
+#: Src/wptKeyManagerDlg.cpp:1964
msgid "Keyserver refresh finished."
msgstr "Erneuerung von Keyserver abgeschlossen."
@@ -3472,8 +3496,8 @@
msgid "I trust ultimately (implicit)"
msgstr "(Implizites) Absolutes Vertrauen"
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:239
-#: Src/wptVerifyList.cpp:302
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
+#: Src/wptVerifyList.cpp:309
msgid "Unknown"
msgstr "Unbekannt"
@@ -3481,13 +3505,13 @@
msgid "Invalid"
msgstr "Ungültig"
-#: Src/wptKeyPropsDlg.cpp:204
+#: Src/wptKeyPropsDlg.cpp:205
#, c-format
msgid "Card-Type: %s\r\n"
msgstr "Karten-Typ: %s\r\n"
# c:\oss\winpt-gpgme\src\wptKeyPropsDlg.cpp:214
-#: Src/wptKeyPropsDlg.cpp:243
+#: Src/wptKeyPropsDlg.cpp:244
#, c-format
msgid ""
"Type: %s\r\n"
@@ -3510,25 +3534,25 @@
"Cipher: %s\r\n"
"%s\r\n"
-#: Src/wptKeyPropsDlg.cpp:282
+#: Src/wptKeyPropsDlg.cpp:283
msgid "&Change"
msgstr "&Ändern"
-#: Src/wptKeyPropsDlg.cpp:283
+#: Src/wptKeyPropsDlg.cpp:284
msgid "&Revokers"
msgstr "&Widerrufer"
-#: Src/wptKeyPropsDlg.cpp:284
+#: Src/wptKeyPropsDlg.cpp:285
msgid "Change &Password"
msgstr "&Passwort ändern"
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Photo-ID not validated."
msgstr "Foto-ID nicht geprüft."
# msgid "Unknown"
# msgstr "Unbekannt"
-#: Src/wptKeyPropsDlg.cpp:354
+#: Src/wptKeyPropsDlg.cpp:355
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -3536,7 +3560,7 @@
"Der Status dieses Schlüssels ist 'widerrufen' oder 'abgelaufen'.\n"
"Sie können das Vertrauen in solche Schlüssel nicht ändern."
-#: Src/wptKeyPropsDlg.cpp:360
+#: Src/wptKeyPropsDlg.cpp:361
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3547,11 +3571,11 @@
"Das Vertrauen solcher Schlüssel zu ändern hat keinerlei Effekt.\n"
"Trotzdem fortfahren?"
-#: Src/wptKeyPropsDlg.cpp:378
+#: Src/wptKeyPropsDlg.cpp:379
msgid "Ownertrust successfully changed."
msgstr "Besitzervertrauen erfolgreich geändert."
-#: Src/wptKeyPropsDlg.cpp:391 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:392 Src/wptKeyRevokersDlg.cpp:160
msgid "Key Revokers"
msgstr "Schlüsselwiderrufer"
@@ -3699,11 +3723,11 @@
msgid "Key(s) sucessfully received and imported."
msgstr "Schlüssel erfolgreich empfangen und importiert."
-#: Src/wptKeyserverDlg.cpp:160
+#: Src/wptKeyserverDlg.cpp:161
msgid "Imported Keys"
msgstr "Importierte Schlüssel"
-#: Src/wptKeyserverDlg.cpp:186
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3713,110 +3737,110 @@
"Bitte stellen Sie sicher, dass Sie eine Internetverbindung hergestellt haben "
"und gpgkeys_ldap.exe installiert ist."
-#: Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "Finger Schlüsselimport fehlgeschlagen: %s\n"
-#: Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr "Dies ist kein gültiger OpenPGP-Schlüssel."
-#: Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:363
msgid "Please select one of the servers."
msgstr "Bitte einen der Server auswählen."
-#: Src/wptKeyserverDlg.cpp:366
-msgid "Only HTTP keyserver can be used."
-msgstr "Nur HTTP-Schlüsselserver können benutzt werden."
+#: Src/wptKeyserverDlg.cpp:369
+msgid "Only HKP keyserver can be used."
+msgstr "Nur HKP-Schlüsselserver können benutzt werden."
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:386
msgid "DNS Name"
msgstr "DNS Name"
-#: Src/wptKeyserverDlg.cpp:384
+#: Src/wptKeyserverDlg.cpp:387
msgid "Port"
msgstr "Port"
-#: Src/wptKeyserverDlg.cpp:468
+#: Src/wptKeyserverDlg.cpp:471
msgid "No space for new keyserver entry"
msgstr "Kein Platz für neuen Keserver-Eintrag"
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:492
msgid "HKP Keyserver"
msgstr "HKP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:493
msgid "LDAP Keyserver"
msgstr "LDAP-Schlüsselserver"
-#: Src/wptKeyserverDlg.cpp:491
+#: Src/wptKeyserverDlg.cpp:494
msgid "Finger Keyserver"
msgstr "Finger-Keyserver"
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
-#: Src/wptKeyserverDlg.cpp:753
+#: Src/wptKeyserverDlg.cpp:519 Src/wptKeyserverDlg.cpp:736
+#: Src/wptKeyserverDlg.cpp:756
msgid "Edit Keyserver"
msgstr "Editiere Keyserver"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:612
msgid "&Add"
msgstr "&Hinzufügen"
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:522
msgid "Type:"
msgstr "Typ:"
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:523
msgid "Port:"
msgstr "Port:"
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:524
msgid "Host name:"
msgstr "Rechnername:"
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:532
msgid "Please enter a host name"
msgstr "Bitte einen Rechnernamen eingeben."
-#: Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:537
msgid "Invalid port, valid numbers are < 65535"
msgstr "Ungültiger Port, gültige Nummern sind < 65535"
-#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:581 Src/wptKeyserverSearchDlg.cpp:65
msgid "&Receive"
msgstr "&Empfangen"
-#: Src/wptKeyserverDlg.cpp:580
+#: Src/wptKeyserverDlg.cpp:583
msgid "Send key (default is receiving)"
msgstr "Schlüssel senden (sonst empfangen)"
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:585
msgid "Key ID or email address you want to search for"
msgstr "Key ID oder E-Mail-Adresse eingeben die gesucht wird"
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:586
msgid "&Search"
msgstr "&Suchen"
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:587
msgid "C&hange proxy"
msgstr "Proxy Ä&ndern"
-#: Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyserverDlg.cpp:588
msgid "Set &default"
msgstr "Als &Standard"
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:613
msgid "&Remove"
msgstr "&Entfernen"
-#: Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyserverDlg.cpp:614
msgid "&Edit"
msgstr "&Edtieren"
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:648 Src/wptProxySettingsDlg.cpp:73
#: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
#: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
#: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -3824,23 +3848,23 @@
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
+#: Src/wptKeyserverDlg.cpp:656 Src/wptKeyserverDlg.cpp:697
msgid "Please enter the search pattern."
msgstr "Bitte Suchmuster eingeben."
-#: Src/wptKeyserverDlg.cpp:678
+#: Src/wptKeyserverDlg.cpp:681
msgid "Please select one of the keyservers."
msgstr "Bitte einen Keyserver auswählen."
-#: Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:702
msgid "Only keyids are allowed."
msgstr "Nur Schlüssel-IDs zulässig"
-#: Src/wptKeyserverDlg.cpp:705
+#: Src/wptKeyserverDlg.cpp:708
msgid "Only enter the name of the user."
msgstr "Nur den Namen des Benutzers eingeben."
-#: Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:714
msgid "Only email addresses or keyids are allowed."
msgstr "Es sind nur E-Mail-Adressen oder Schlüssel-IDs zulässig"
@@ -3853,12 +3877,12 @@
msgid "Keyserver Searching"
msgstr "Schlüsselserver-Suche"
-#: Src/wptKeyserverSearchDlg.cpp:94 Src/wptKeyserverSearchDlg.cpp:99
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:95 Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Keyserver Search"
msgstr "Schlüsselserver-Suche"
-#: Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:101
#, c-format
msgid ""
"The search result contains a lot of keys: %d\n"
@@ -3888,83 +3912,87 @@
msgid "signature"
msgstr "Signatur"
-#: Src/wptKeysigDlg.cpp:131
+#: Src/wptKeysigDlg.cpp:147
#, c-format
msgid "%s %s signature"
msgstr "%s %s Signatur"
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:163 Src/wptKeysigDlg.cpp:205
+#: Src/wptKeysigDlg.cpp:155 Src/wptKeysigDlg.cpp:180 Src/wptKeysigDlg.cpp:213
msgid "Exportable"
msgstr "Exportierbar"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:183
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:156 Src/wptKeysigDlg.cpp:214
msgid "Non-revocably"
msgstr "Nicht widerrufbar"
# c:\oss\winpt-gpgme\src\wptSigList.cpp:49
-#: Src/wptKeysigDlg.cpp:143 Src/wptSigList.cpp:55
+#: Src/wptKeysigDlg.cpp:159 Src/wptSigList.cpp:55
msgid "Class"
msgstr "Klasse"
-#: Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:160
msgid "Expire date"
msgstr "Ablaufdatum"
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:161
+msgid "Creation date"
+msgstr "Erstellung"
+
+#: Src/wptKeysigDlg.cpp:162
msgid "Issuer key"
msgstr "Schlüssel des Ausstellers"
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:163
msgid "Issuer key ID"
msgstr "Key ID des Ausstellers"
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:164
msgid "Policy URL"
msgstr "Policy URL"
-#: Src/wptKeysigDlg.cpp:148 Src/wptKeysigDlg.cpp:209
+#: Src/wptKeysigDlg.cpp:165 Src/wptKeysigDlg.cpp:217
msgid "Signature Properties"
msgstr "Signatureigenschaften"
-#: Src/wptKeysigDlg.cpp:163
+#: Src/wptKeysigDlg.cpp:180
msgid "Non-exportable"
msgstr "Nicht-exportierbar"
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:153
+#: Src/wptKeysigDlg.cpp:193 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr " Benutzerkennung nicht gefunden"
-#: Src/wptKeysigDlg.cpp:308
+#: Src/wptKeysigDlg.cpp:316
msgid "Really receive all missing keys?"
msgstr "Alle fehlenden Schlüssel empfangen?"
-#: Src/wptKeysigDlg.cpp:342 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:350 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "Signatur-&Eigenschaften"
-#: Src/wptKeysigDlg.cpp:343
+#: Src/wptKeysigDlg.cpp:351
msgid "Signing &Key Properties"
msgstr "Signing Key-Eigenschaften"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:294
-#: Src/wptKeysigDlg.cpp:380
+#: Src/wptKeysigDlg.cpp:388
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr ""
"Schlüssel nicht im Schlüsselbund gefunden, wollen Sie den Schlüssel "
"runterladen?"
# c:\oss\winpt-gpgme\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:391
+#: Src/wptKeysigDlg.cpp:399
msgid "Key not found in keyring."
-msgstr "Schlüssel im Keyring nicht gefunden."
+msgstr "Schlüssel im Schlüsselbund nicht gefunden."
-#: Src/wptKeysigDlg.cpp:416
+#: Src/wptKeysigDlg.cpp:424
#, c-format
msgid "Signature List for \"%s\""
msgstr "Signaturliste für \"%s\""
-#: Src/wptKeysigDlg.cpp:418
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr "&Schlüssel empfangen"
@@ -3978,7 +4006,7 @@
msgid "Photo of %s"
msgstr "Foto von %s"
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
msgid "Choose Signature Class"
msgstr "Signaturklasse auswählen"
@@ -4015,64 +4043,66 @@
msgid "never"
msgstr "niemals"
-#: Src/wptKeysignDlg.cpp:313
+#: Src/wptKeysignDlg.cpp:304
#, c-format
msgid ""
-"pub %d/%s created: %s expires: %s\n"
+"pub %d/0x%s created: %s expires: %s\n"
"\n"
"Primary key fingerprint: %s\n"
"\n"
-"\t%s\n"
+msgstr ""
+"pub %d/0x%s erzeugt: %s läuft ab: %s\n"
"\n"
+"primärer Fingerabdruck: %s\n"
"\n"
+
+#: Src/wptKeysignDlg.cpp:321
+msgid ""
+"\n"
+"\n"
"Are you really sure that you want to sign this key with YOUR key?\n"
msgstr ""
-"pub %d/%s erzeugt: %s läuft ab: %s\n"
"\n"
-"Fingerabdruck: %s\n"
"\n"
-"\t%s\n"
-"\n"
-"\n"
"Wollen Sie diesen Schlüssel wirklich mit Ihrem eigenen Schlüssel signieren?\n"
-#: Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:351
msgid "No valid secret key found."
-msgstr "Keine gültigen geheimen Schlüssel gefunden."
+msgstr "Kein gültiger geheimer Schlüssel gefunden."
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:357
msgid "Sign local only (non exportable signature)"
msgstr "Nur lokal Signieren (nicht exportierbare Signatur)"
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:358
msgid "Signature expires on"
msgstr "Signatur läuft ab am"
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:250
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:359
msgid "Sign non-revocably"
msgstr "Nicht-widerrufbar signieren"
-#: Src/wptKeysignDlg.cpp:334
+#: Src/wptKeysignDlg.cpp:360
msgid "&Ask for certification level"
msgstr "Zertifizierungslevel erfragen"
-#: Src/wptKeysignDlg.cpp:337
+#: Src/wptKeysignDlg.cpp:363
msgid "&Show photo"
msgstr "&Photo anzeigen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:391
-#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
+#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:97
+#: Src/wptPassphraseCB.cpp:103 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "&Maskiere Eingabe"
-#: Src/wptKeysignDlg.cpp:399
+#: Src/wptKeysignDlg.cpp:425
msgid "You cannot select today as the expiration date."
msgstr "Das Ablaufdatum kann nicht auf den heutigen Tag gesetzt werden."
-#: Src/wptKeysignDlg.cpp:433
+#: Src/wptKeysignDlg.cpp:460
msgid "This key is already signed by your key"
msgstr "Der Schlüssel ist bereits mit Ihrem Schlüssel signiert"
@@ -4081,62 +4111,62 @@
msgstr "Vertrauensliste"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:115
-#: Src/wptMainProc.cpp:104
+#: Src/wptMainProc.cpp:103
msgid "Delete Clipboard Contents"
msgstr "Lösche Inhalt der Zwischenablage"
-#: Src/wptMainProc.cpp:106
+#: Src/wptMainProc.cpp:105
msgid "&Remember the answer"
msgstr "&Nicht mehr nachfragen"
-#: Src/wptMainProc.cpp:108
+#: Src/wptMainProc.cpp:107
msgid "Do you want to delete the contents from the clipboard?"
msgstr "Wollen Sie den Inhalt der Zwischenablage löschen?"
-#: Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:154
msgid "Could not access secret keyring."
msgstr "Auf denn geheimen Schlüsselbund konnte nicht zugegriffen werden."
-#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:214 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Texteingabe"
-#: Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:242
msgid "Unknown OpenPGP type."
msgstr "Unbekannter OpenPGP-Typ."
-#: Src/wptMainProc.cpp:370
+#: Src/wptMainProc.cpp:342
msgid "Could not set current window mode hooks."
msgstr "Konnte \"Current Window\" Hooks nicht setzen."
-#: Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:394
msgid "About..."
msgstr "Über..."
-#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:404
msgid "Decrypt/Verify"
msgstr "Entschlüsseln/Überprüfen"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:443
+#: Src/wptMainProc.cpp:415
msgid "Current Window"
msgstr "Aktuelles Fenster"
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:473
msgid "Remove all passphrases from cache?"
msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
-#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:474 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
-#: Src/wptMainProc.cpp:512
+#: Src/wptMainProc.cpp:484
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
"WinPT beenden?"
-#: Src/wptMainProc.cpp:545
+#: Src/wptMainProc.cpp:517
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4145,10 +4175,6 @@
"Stellen Sie sicher, dass das Fenster Text enthält.\n"
"%s."
-#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
-msgid "WinPT Preferences"
-msgstr "WinPT Einstellungen"
-
# c:\oss\winpt-gpgme\src\wptMAPI.cpp:87
# c:\oss\winpt-gpgme\src\wptMAPI.cpp:120
#: Src/wptMAPI.cpp:133 Src/wptMAPI.cpp:208
@@ -4183,7 +4209,7 @@
#: Src/wptMDSumDlg.cpp:277
#, c-format
msgid "Checksums successfully saved in '%s'"
-msgstr "Prüfsummen erfolgreich in '%s' gespeichert."
+msgstr "Prüfsummen erfolgreich in '%s' gespeichert"
#: Src/wptOwnertrustDlg.cpp:100
msgid ""
@@ -4211,25 +4237,25 @@
msgid "Ownertrust successfully imported."
msgstr "Besitzervertrauen erfolgreich importiert."
-#: Src/wptPassphraseCB.cpp:98
+#: Src/wptPassphraseCB.cpp:99
msgid "Encrypted with the following public key(s)"
msgstr "Verschlüsselt mit folgenden öffentlichen Schlüssel(n)"
-#: Src/wptPassphraseCB.cpp:142
+#: Src/wptPassphraseCB.cpp:143
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "Unbekannte Schlüssel-ID (%s, 0x%s)"
# c:\oss\winpt-gpgme\src\wptPassphraseCB.cpp:124
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:155
msgid "Bad passphrase; Enter passphrase again"
msgstr "Ungültiges Passwort; Bitte Passwort erneut eingeben"
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:156
msgid "Please enter your passphrase"
msgstr "Bitte geben Sie Ihr Passwort ein"
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:160
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -4241,23 +4267,23 @@
#: Src/wptPassphraseCB.cpp:306
#, 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"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s (main key ID 0x%s)\n"
msgstr ""
-"Sie benötigen das Passwort, um den geheimen Schlüssel zu entsperren\n"
-"Benutzer: \"%s\"\n"
-"%s Schlüssel, ID %s (Hauptschlüssel ID %s)\n"
+"Sie benötigen das Passwort, um den geheimen Schlüssel zu entsperren:\n"
+"\"%s\"\n"
+"%s Schlüssel, ID 0x%s (Hauptschlüssel ID 0x%s)\n"
#: Src/wptPassphraseCB.cpp:312
#, c-format
msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-"%s key, ID %s\n"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s\n"
msgstr ""
-"Sie benötigen das Passwort, um den geheimen Schlüssel zu entsperren\n"
-"Benutzer: \"%s\"\n"
+"Sie benötigen das Passwort, um den geheimen Schlüssel zu entsperren:\n"
+"\"%s\"\n"
"%s key, ID %s\n"
#: Src/wptPassphraseCB.cpp:400
@@ -4432,7 +4458,7 @@
#: Src/wptPreferencesDlg.cpp:294
msgid "The specified backup folder is invalid."
-msgstr "Der angegebene Sicherungsordner ist ungültig."
+msgstr "Der angegebene Backupverzeichnis ist ungültig."
#: Src/wptPreferencesDlg.cpp:332
msgid "Hotkeys"
@@ -4448,7 +4474,7 @@
#: Src/wptProxySettingsDlg.cpp:82
msgid "Please enter the proxy hostname."
-msgstr "Bitte geben Sie den Proxy-Hostname ein."
+msgstr "Bitte geben Sie den Proxy-Hostnamen ein."
#: Src/wptProxySettingsDlg.cpp:88
msgid "Invalid port number."
@@ -4570,11 +4596,11 @@
msgid "PKA: Verified signer's address is '%s'"
msgstr "PKA: Überprüfte Adresse des Unterzeichners ist '%s'"
-#: Src/wptVerifyList.cpp:130
+#: Src/wptVerifyList.cpp:136
msgid "The signature is expired!"
msgstr "Die Signatur ist abgelaufen!"
-#: Src/wptVerifyList.cpp:135
+#: Src/wptVerifyList.cpp:142
msgid ""
"WARNING: This key is not certified with a trusted signature!\r\n"
" There is no indication that the signature belongs to the "
@@ -4584,10 +4610,20 @@
" Es gibt keinen Hinweis, dass die Signatur wirklich zu "
"dieser Person gehört.\r\n"
-#: Src/wptVerifyList.cpp:163
+#: Src/wptVerifyList.cpp:170
msgid "Signed"
msgstr "Signiert"
+#~ msgid ""
+#~ "Encrypted with %s key, ID %s.%s\n"
+#~ "Decryption failed: secret key not available."
+#~ msgstr ""
+#~ "Verschlüsselt mit %s Schlüssel, ID %s.%s\n"
+#~ "Entschlüsselung fehlgeschlagen: geheimer Schlüssel nicht verfügbar."
+
+#~ msgid "No GPG error description available."
+#~ msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
+
#~ msgid "Admin PIN must be minimal 8 characters."
#~ msgstr "Die 'Admin PIN' muss mindestens 8 Zeichen lang sein."
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Po/jp.po 2006-08-05 10:31:06 UTC (rev 256)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-07-29 12:51+0200\n"
+"POT-Creation-Date: 2006-08-05 12:29+0200\n"
"PO-Revision-Date: 2005-12-22 07:28+0100\n"
"Last-Translator: Davar Pishva <dpishva at andrew.cmu.edu>\n"
"Language-Team: jp <jp at li.org>\n"
@@ -13,8 +13,14 @@
"Content-Type: text/plain; charset=Shift_JIS\n"
"Content-Transfer-Encoding: 8bit\n"
+#: Src/WinPT.cpp:75
+msgid ""
+"The gpg.conf contains at least one argument which points to a non-existing "
+"file."
+msgstr ""
+
# c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:188
+#: Src/WinPT.cpp:195
msgid "Could not create GPG home directory"
msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -29,34 +35,34 @@
# c:\oss\winpt\src\wptGPG.cpp:886 c:\oss\winpt\src\wptGPG.cpp:896
# c:\oss\winpt\src\wptGPGME.cpp:175 c:\oss\winpt\src\wptMainProc.cpp:337
# c:\oss\winpt\src\wptMainProc.cpp:509
-#: Src/WinPT.cpp:189 Src/WinPT.cpp:271 Src/WinPT.cpp:275 Src/WinPT.cpp:476
-#: Src/WinPT.cpp:485 Src/WinPT.cpp:492 Src/WinPT.cpp:532 Src/WinPT.cpp:560
-#: Src/WinPT.cpp:569 Src/WinPT.cpp:573 Src/WinPT.cpp:590 Src/WinPT.cpp:658
-#: Src/WinPT.cpp:671 Src/WinPT.cpp:718 Src/WinPT.cpp:748 Src/WinPT.cpp:766
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:912
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:934 Src/wptGPG.cpp:945
-#: Src/wptMainProc.cpp:371 Src/wptMainProc.cpp:544
+#: Src/WinPT.cpp:196 Src/WinPT.cpp:278 Src/WinPT.cpp:282 Src/WinPT.cpp:483
+#: Src/WinPT.cpp:492 Src/WinPT.cpp:499 Src/WinPT.cpp:539 Src/WinPT.cpp:567
+#: Src/WinPT.cpp:576 Src/WinPT.cpp:580 Src/WinPT.cpp:597 Src/WinPT.cpp:665
+#: Src/WinPT.cpp:678 Src/WinPT.cpp:725 Src/WinPT.cpp:760 Src/WinPT.cpp:779
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:926
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:948 Src/wptGPG.cpp:959
+#: Src/wptMainProc.cpp:343 Src/wptMainProc.cpp:516
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/WinPT.cpp:220
+#: Src/WinPT.cpp:227
msgid "No useable secret key found."
msgstr "Žg—p‚Å‚«‚é”é–§Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:173
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:180
-#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:356 Src/wptKeyPropsDlg.cpp:363
+#: Src/WinPT.cpp:228 Src/wptKeyPropsDlg.cpp:357 Src/wptKeyPropsDlg.cpp:364
msgid "WinPT Warning"
msgstr "WinPT Œx"
# c:\oss\winpt\src\WinPT.cpp:155
-#: Src/WinPT.cpp:270
+#: Src/WinPT.cpp:277
msgid "Could not read GnuPG version."
msgstr "GnuPGƒo[ƒWƒ‡ƒ“î•ñ‚ð“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:161
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:283
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
@@ -66,7 +72,7 @@
"•K—v‚Æ‚³‚ê‚Ä‚¢‚éƒo[ƒWƒ‡ƒ“‚ª %d.%d.%d ‚Å‚·B"
# c:\oss\winpt\src\wptErrors.cpp:93
-#: Src/WinPT.cpp:304
+#: Src/WinPT.cpp:311
msgid "Failed to create WinPT directory"
msgstr "WinPTƒfƒBƒŒƒNƒgƒŠ‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -85,26 +91,26 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:998 Src/wptKeyserver.cpp:634
+#: Src/WinPT.cpp:312 Src/WinPT.cpp:329 Src/WinPT.cpp:340
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
-#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
-#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
-#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
-#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
-#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
+#: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:364
+#: Src/wptKeyserverDlg.cpp:370 Src/wptKeyserverDlg.cpp:472
+#: Src/wptKeyserverDlg.cpp:532 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:657 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:698 Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:709 Src/wptKeyserverDlg.cpp:715
msgid "Keyserver"
msgstr "ƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/WinPT.cpp:321
+#: Src/WinPT.cpp:328
msgid "Failed to copy the keyserver.conf"
msgstr "keyserver.conf‚̃tƒ@ƒCƒ‹ƒRƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
-#: Src/WinPT.cpp:477
+#: Src/WinPT.cpp:484
#, c-format
msgid ""
"The PTD.dll file has a different version than WinPT.exe\n"
@@ -112,16 +118,16 @@
msgstr ""
# c:\oss\winpt\src\WinPT.cpp:223
-#: Src/WinPT.cpp:484
+#: Src/WinPT.cpp:491
msgid "Cryptographic selftest failed."
msgstr "ˆÃ†–@ƒZƒ‹ƒtƒeƒXƒg‚ªŽ¸”s‚µ‚Ü‚µ‚½B"
-#: Src/WinPT.cpp:491
+#: Src/WinPT.cpp:498
msgid "A newer GPGME version is needed; at least "
msgstr "‚È‚‚Ä‚àGPME‚ÌV‚µ‚¢ƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B"
# c:\oss\winpt\src\WinPT.cpp:242
-#: Src/WinPT.cpp:533
+#: Src/WinPT.cpp:540
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -133,18 +139,18 @@
"%s."
# c:\oss\winpt\src\WinPT.cpp:246
-#: Src/WinPT.cpp:537
+#: Src/WinPT.cpp:544
msgid "Select GPG Public Keyring"
msgstr "GPGŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:268
-#: Src/WinPT.cpp:559
+#: Src/WinPT.cpp:566
#, fuzzy
msgid "GPG home directory could not be determined."
msgstr "GPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:276
-#: Src/WinPT.cpp:567
+#: Src/WinPT.cpp:574
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -152,7 +158,7 @@
"GPGƒoƒCƒiƒŠ(gpg.exe)‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
"GPG ƒJƒXƒ^ƒ€Ý’è‚ð‹N“®‚µ‚Ä‚±‚Ì–â‘è‚ð‰ðŒˆ‚µ‚Ü‚·‚©H"
-#: Src/WinPT.cpp:582
+#: Src/WinPT.cpp:589
#, fuzzy
msgid ""
"Could not access and/or find the public and secret keyring.\n"
@@ -166,23 +172,23 @@
"‚±‚Ì‚Ü‚Ü‘±‚¯‚éꇂÍAWinPT‚ª‚¢‚ë‚¢‚ë‚È‘I‘ð‚ð’ño‚µ‚Ü‚·B\n"
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
-#: Src/WinPT.cpp:615 Src/wptFileManagerDlg.cpp:525
-#: Src/wptFileManagerDlg.cpp:835
+#: Src/WinPT.cpp:622 Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:828
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
# c:\oss\winpt\src\WinPT.cpp:382
-#: Src/WinPT.cpp:657
+#: Src/WinPT.cpp:664
msgid "Could not register window class"
msgstr "ƒEƒBƒ“ƒh‚̃Nƒ‰ƒX‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:395
-#: Src/WinPT.cpp:671
+#: Src/WinPT.cpp:678
msgid "Could not create window"
msgstr "ƒEƒBƒ“ƒh‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:461
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:758
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -191,7 +197,7 @@
"GPG‚±‚¤‚¹‚¢ (ƒL[ƒŠƒ“ƒO, ƒpƒX‚È‚Ç...) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:464
-#: Src/WinPT.cpp:749
+#: Src/WinPT.cpp:761
#, fuzzy
msgid ""
"It seems that GPG is not configured properly.\n"
@@ -201,7 +207,7 @@
"GPGƒJƒXƒ^ƒ€Ý’è‚ðŽÀs‚µ‚Ü‚·H"
# c:\oss\winpt\src\WinPT.cpp:480
-#: Src/WinPT.cpp:767
+#: Src/WinPT.cpp:780
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -229,7 +235,7 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
# c:\oss\winpt\src\wptMainProc.cpp:560
#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:565
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -285,13 +291,13 @@
msgstr "GPG‚ɂ‚¢‚Ä..."
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "&Help"
msgstr "ƒwƒ‹ƒv(&H)"
# c:\oss\winpt\src\WinPT.cpp:340 c:\oss\winpt\src\wptCardDlg.cpp:98
# c:\oss\winpt\src\wptCardDlg.cpp:125 c:\oss\winpt\src\wptMainProc.cpp:389
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:392
msgid "Card Manager"
msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
@@ -328,7 +334,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:291
+#: Src/wptMainProc.cpp:263
msgid "Card Edit"
msgstr "ƒJ[ƒh•ÒW"
@@ -401,7 +407,7 @@
msgstr "–¼‘O(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:148
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "ƒIƒvƒVƒ‡ƒiƒ‹ƒRƒƒ“ƒg(&C)"
@@ -410,7 +416,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "—LŒøŠúŒÀ(&E)"
@@ -420,12 +426,12 @@
msgstr "ƒJ[ƒhŠOƒpƒXƒtƒŒ[ƒY"
# c:\oss\winpt\src\wptKeygenDlg.cpp:154
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:381
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "‚Í‚¸‚Í‚È‚¢(&N)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:149
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX(&A)"
@@ -439,7 +445,7 @@
msgstr "ˆÃ†‰»ƒL[‚̃J[ƒhŠOƒoƒbƒNƒAƒbƒv‚ðì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1049
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1795
msgid "Card Key Generation"
msgstr "ƒJ[ƒhƒL[ì¬"
@@ -475,7 +481,7 @@
# c:\oss\winpt\src\wptCardDlg.cpp:580
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1153
# c:\oss\winpt\src\wptKeygenDlg.cpp:310
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:457
#, fuzzy
msgid "The date you have chosen has already passed."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
@@ -564,33 +570,33 @@
"Œp‘±‚·‚é‚Ì‚ÉOK‚Ü‚½‚̓Lƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:48
-#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
+#: Src/wptClipDecryptDlg.cpp:60 Src/wptClipDecryptDlg.cpp:177
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
-#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
+#: Src/wptVerifyList.cpp:257 Src/wptVerifyList.cpp:317
msgid "user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
msgid "Signature status: created with a fully trusted key"
msgstr "–¼‚Ìó‘ÔFŠ®‘S‚ÉM—p‚Å‚«‚éƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:172
-#: Src/wptClipDecryptDlg.cpp:108
+#: Src/wptClipDecryptDlg.cpp:110
msgid "Signature status: created with a marginal trusted key"
msgstr "–¼‚Ìó‘ÔF‚ ‚Ü‚èM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:177
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:113
msgid "Signature status: created with an UNTRUSTED key"
msgstr "–¼‚Ìó‘ÔFM—p‚Å‚«‚È‚¢ƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:170
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:116
msgid "Signature status: created with an undefined trusted key"
msgstr "–¼‚Ìó‘ÔF’è‹`‚³‚ê‚Ä‚¢‚È‚¢Š®‘S‚ÉM—p‚Å‚«‚éƒL[‚Åì‚ç‚ꂽ‚à‚Ì"
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:126
#, c-format
msgid ""
"*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -609,7 +615,7 @@
"*** –¼ŽÒ: %s (0x%s)\r\n"
"*** PGP•œ†ƒeƒLƒXƒg‚ðŽn‚ß‚é ***\r\n"
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:133
msgid ""
"\r\n"
"*** END PGP DECRYPTED TEXT ***"
@@ -618,12 +624,12 @@
"*** PGP•œ†ƒeƒLƒXƒg‚ðI—¹‚·‚é ***"
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptClipDecryptDlg.cpp:178
+#: Src/wptClipDecryptDlg.cpp:181
msgid "Decrypt Verify"
msgstr "•œ†/Šm”F"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:188
-#: Src/wptClipDecryptDlg.cpp:179
+#: Src/wptClipDecryptDlg.cpp:182
#, c-format
msgid ""
"%s\n"
@@ -653,14 +659,14 @@
# c:\oss\winpt\src\wptMainProc.cpp:191 c:\oss\winpt\src\wptMainProc.cpp:259
# c:\oss\winpt\src\wptMainProc.cpp:271 c:\oss\winpt\src\wptMainProc.cpp:279
# c:\oss\winpt\src\wptMainProc.cpp:406
-#: Src/wptClipDecryptDlg.cpp:213 Src/wptClipVerifyDlg.cpp:157
-#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
-#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
-#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
-#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
+#: Src/wptClipDecryptDlg.cpp:216 Src/wptClipVerifyDlg.cpp:154
+#: Src/wptClipVerifyDlg.cpp:162 Src/wptClipVerifyDlg.cpp:191
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:220
+#: Src/wptClipVerifyDlg.cpp:232 Src/wptFileManager.cpp:1636
+#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:584
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
-#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
+#: Src/wptMainProc.cpp:206 Src/wptMainProc.cpp:222 Src/wptMainProc.cpp:232
+#: Src/wptMainProc.cpp:401
msgid "Verify"
msgstr "Šm”F‚·‚é"
@@ -670,35 +676,35 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:138
# c:\oss\winpt\src\wptFileManager.cpp:952
# c:\oss\winpt\src\wptFileManager.cpp:996
-#: Src/wptClipDecryptDlg.cpp:220 Src/wptClipDecryptDlg.cpp:233
-#: Src/wptClipDecryptDlg.cpp:241 Src/wptClipDecryptDlg.cpp:248
-#: Src/wptClipDecryptDlg.cpp:250 Src/wptFileManager.cpp:1343
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptClipDecryptDlg.cpp:251
+#: Src/wptClipDecryptDlg.cpp:253 Src/wptFileManager.cpp:1343
#: Src/wptFileManager.cpp:1394
msgid "Decryption"
msgstr "•œ†"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
# c:\oss\winpt\src\wptFileManager.cpp:997
-#: Src/wptClipDecryptDlg.cpp:234 Src/wptFileManager.cpp:1395
-#, c-format
+#: Src/wptClipDecryptDlg.cpp:237 Src/wptFileManager.cpp:1395
+#, fuzzy, c-format
msgid ""
-"Encrypted with %s key, ID %s.%s\n"
+"Encrypted with %s key, ID 0x%s.%s\n"
"Decryption failed: secret key not available."
msgstr ""
" %s‚ňƉ»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
"•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
-#: Src/wptClipDecryptDlg.cpp:241
+#: Src/wptClipDecryptDlg.cpp:244
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "‘Ήž‚³‚ê‚Ä‚È‚¢ƒAƒ‹ƒSƒŠƒYƒ€: %s"
-#: Src/wptClipDecryptDlg.cpp:247
+#: Src/wptClipDecryptDlg.cpp:250
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr "•s–¾‚ÈOpenPGPƒƒbƒZ[ƒW"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
-#: Src/wptClipDecryptDlg.cpp:257
+#: Src/wptClipDecryptDlg.cpp:260
#, fuzzy
msgid ""
"WARNING: encrypted message has been manipulated!\n"
@@ -714,7 +720,7 @@
"‚Ü‚½‚Í‚±‚ê‚̓Aƒ^ƒbƒN‚Ì•”•ª‚Æ‚µ‚Ä‚àl‚¦‚ç‚ê‚Ü‚·B"
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:149
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:265
msgid "*** IMPORTANT ***"
msgstr "*** d—v ***"
@@ -726,10 +732,10 @@
# c:\oss\winpt\src\wptKeyManager.cpp:274
# c:\oss\winpt\src\wptKeyManager.cpp:610
# c:\oss\winpt\src\wptKeyManager.cpp:852 c:\oss\winpt\src\wptSymEnc.cpp:52
-#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
-#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:269 Src/wptClipEncryptDlg.cpp:216
+#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:265
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:992 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:994 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
@@ -746,9 +752,9 @@
#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
+#: Src/wptMainProc.cpp:191 Src/wptMainProc.cpp:242 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:497 Src/wptMainProc.cpp:502
msgid "Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
@@ -796,7 +802,7 @@
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:501
msgid "&Open..."
msgstr "ŠJ‚(&O)..."
@@ -805,23 +811,23 @@
msgid "&Save..."
msgstr "•Û‘¶...(&S)"
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:514
msgid "&Paste"
msgstr "‚Í‚è•t‚¯(&P)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:355
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:502
msgid "&Encrypt"
msgstr "ˆÃ†‰»(&E)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:356
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:504
msgid "&Decrypt"
msgstr "•œ†(&D)"
# c:\oss\winpt\src\wptClipEditDlg.cpp:45 c:\oss\winpt\src\wptMainProc.cpp:181
# c:\oss\winpt\src\wptMainProc.cpp:249 c:\oss\winpt\src\wptMainProc.cpp:554
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:559
msgid "Clipboard Editor"
msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
@@ -840,31 +846,30 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
# c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:155
-#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipEncryptDlg.cpp:212
-#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
-#: Src/wptMainProc.cpp:216
+#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:170
msgid "Encryption"
msgstr "ˆÃ†‰»"
# c:\oss\winpt\src\wptFileSaveDlg.cpp:88
# c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:157
msgid "&Find"
msgstr "ŒŸŽ@(&F)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptClipEncryptDlg.cpp:157 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:231
-#: Src/wptFileManagerDlg.cpp:293 Src/wptFileSaveDlg.cpp:59
-#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:166
+#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
+#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:549 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
+#: Src/wptKeyserverDlg.cpp:521 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:94
#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
@@ -872,12 +877,12 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:109
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:110
-#: Src/wptClipEncryptDlg.cpp:204 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
msgid "You must select at least one key."
msgstr "‚È‚‚Ä‚àˆê‚‚̃L[‚ð‘I‘ð‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
-#: Src/wptClipEncryptDlg.cpp:241
+#: Src/wptClipEncryptDlg.cpp:240
#, c-format
msgid "No recipient found with '%s'"
msgstr "'%s'‚É‚æ‚éŽóMŽÒ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -890,7 +895,7 @@
# c:\oss\winpt\src\wptClipSignDlg.cpp:53
# c:\oss\winpt\src\wptClipSignDlg.cpp:138
# c:\oss\winpt\src\wptClipSignEncDlg.cpp:129
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:226
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:224
#: Src/wptClipSignEncDlg.cpp:170
msgid "Could not get default key."
msgstr "‹K’èƒL[‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -909,24 +914,24 @@
# c:\oss\winpt\src\wptFileManager.cpp:848
# c:\oss\winpt\src\wptFileManager.cpp:1053
# c:\oss\winpt\src\wptMainProc.cpp:165 c:\oss\winpt\src\wptMainProc.cpp:229
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:111
-#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:153
-#: Src/wptClipSignDlg.cpp:159 Src/wptClipSignDlg.cpp:227
-#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:251
-#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:109
+#: Src/wptClipSignDlg.cpp:117 Src/wptClipSignDlg.cpp:151
+#: Src/wptClipSignDlg.cpp:157 Src/wptClipSignDlg.cpp:225
+#: Src/wptClipSignDlg.cpp:229 Src/wptClipSignDlg.cpp:249
+#: Src/wptClipSignDlg.cpp:260 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
+#: Src/wptMainProc.cpp:177
msgid "Signing"
msgstr "–¼"
# c:\oss\winpt\src\wptGPG.cpp:178
-#: Src/wptClipSignDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:157
msgid "No useable signing key found"
msgstr "Žg—p‚Å‚«‚é–¼‚·‚éƒL[‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipSignDlg.cpp:147
-#: Src/wptClipSignDlg.cpp:232
+#: Src/wptClipSignDlg.cpp:230
#, c-format
msgid ""
"No key was chosen.\n"
@@ -942,7 +947,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:159 c:\oss\winpt\src\wptMainProc.cpp:235
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
+#: Src/wptMainProc.cpp:184
msgid "Sign & Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -963,12 +968,12 @@
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:136
-#: Src/wptClipVerifyDlg.cpp:140
+#: Src/wptClipVerifyDlg.cpp:139
msgid "Signature Information"
msgstr "ƒVƒOƒjƒ`ƒƒ[‚Ìî•ñ"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:81
-#: Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipVerifyDlg.cpp:155
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -982,18 +987,18 @@
"ƒL[ƒT[ƒo[‚©‚çƒL[‚ðŽæ“¾‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptClipEditDlg.cpp:49 c:\oss\winpt\src\wptGPGOptDlg.cpp:48
-#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
-#: Src/wptGPGOptDlg.cpp:55
+#: Src/wptClipVerifyDlg.cpp:192 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:57
msgid "&Save"
msgstr "•Û‘¶(&S)"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:106
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:220
msgid "Invalid signature state."
msgstr "–¼‚Ì󋵂͖³Œø‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:118
-#: Src/wptClipVerifyDlg.cpp:236
+#: Src/wptClipVerifyDlg.cpp:231
msgid "Could not extract key or signature information."
msgstr "ƒL[‚Ü‚½‚Í–¼î•ñ‚ðŽæ‚èo‚·‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -1005,7 +1010,7 @@
# c:\oss\winpt\src\wptFileSaveDlg.cpp:92
# c:\oss\winpt\src\wptFileSaveDlg.cpp:97
# c:\oss\winpt\src\wptFileSaveDlg.cpp:103
-#: Src/wptClipVerifyDlg.cpp:272 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:267 Src/wptFileSaveDlg.cpp:58
#: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
#: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
#: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -1095,8 +1100,8 @@
#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2065
#: Src/wptKeyEditDlgs.cpp:2128 Src/wptKeyEditDlgs.cpp:2142
#: Src/wptKeyEditDlgs.cpp:2157 Src/wptKeyEditDlgs.cpp:2197
-#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
-#: Src/wptKeyManagerDlg.cpp:1929
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1934
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1105,7 +1110,7 @@
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:339
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:337
msgid "Choose Locale Directory"
msgstr "'Locale'ÃÞ¨Ú¸ÄØ‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢"
@@ -1370,9 +1375,9 @@
#: Src/wptFileManager.cpp:880 Src/wptFileManager.cpp:995
#: Src/wptFileManager.cpp:1545 Src/wptFileManager.cpp:1572
#: Src/wptFileManager.cpp:1591 Src/wptFileManager.cpp:1841
-#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:535
-#: Src/wptFileManagerDlg.cpp:638 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:529
+#: Src/wptFileManagerDlg.cpp:631 Src/wptFileStatDlg.cpp:154
+#: Src/wptMainProc.cpp:390 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1420,7 +1425,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:810
# c:\oss\winpt\src\wptVerifyList.cpp:76 c:\oss\winpt\src\wptVerifyList.cpp:84
#: Src/wptFileManager.cpp:407 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptVerifyList.cpp:162
+#: Src/wptVerifyList.cpp:169
msgid "Status"
msgstr "ó‹µ"
@@ -1430,7 +1435,7 @@
# c:\oss\winpt\src\wptMDSumDlg.cpp:53 c:\oss\winpt\src\wptVerifyList.cpp:75
#: Src/wptFileManager.cpp:408 Src/wptKeyEditDlgs.cpp:1156
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:161
+#: Src/wptVerifyList.cpp:168
msgid "Name"
msgstr "–¼‘O"
@@ -1462,8 +1467,8 @@
# c:\oss\winpt\src\wptFileManager.cpp:779
# c:\oss\winpt\src\wptFileStatDlg.cpp:225
-#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:273
-#: Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:283
+#: Src/wptFileStatDlg.cpp:287
msgid "File Status"
msgstr "ƒtƒ@ƒCƒ‹‚Ìó‘Ô"
@@ -1483,16 +1488,16 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:403
# c:\oss\winpt\src\wptMainProc.cpp:211 c:\oss\winpt\src\wptMainProc.cpp:410
#: Src/wptFileManager.cpp:1183 Src/wptFileManager.cpp:1495
-#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
+#: Src/wptFileManagerDlg.cpp:582 Src/wptMainProc.cpp:154
+#: Src/wptMainProc.cpp:398 Src/wptMainProc.cpp:405
msgid "Sign"
msgstr "–¼"
# c:\oss\winpt\src\wptFileManager.cpp:868
# c:\oss\winpt\src\wptFileManagerDlg.cpp:401
# c:\oss\winpt\src\wptMainProc.cpp:403 c:\oss\winpt\src\wptMainProc.cpp:407
-#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:587
-#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
+#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:580
+#: Src/wptMainProc.cpp:397 Src/wptMainProc.cpp:402
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1506,7 +1511,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:919
# c:\oss\winpt\src\wptMainProc.cpp:401
#: Src/wptFileManager.cpp:1256 Src/wptFileManager.cpp:1261
-#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:396 Src/wptMainProc.cpp:406
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
@@ -1529,7 +1534,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1011
# c:\oss\winpt\src\wptFileManagerDlg.cpp:402
#: Src/wptFileManager.cpp:1403 Src/wptFileManager.cpp:1423
-#: Src/wptFileManagerDlg.cpp:588
+#: Src/wptFileManagerDlg.cpp:581
msgid "Decrypt"
msgstr "•œ†"
@@ -1596,11 +1601,11 @@
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
#: Src/wptFileManager.cpp:1734 Src/wptFileManager.cpp:1745
-#: Src/wptFileManagerDlg.cpp:250 Src/wptImportList.cpp:404
+#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:404
#: Src/wptImportList.cpp:411 Src/wptImportList.cpp:421
#: Src/wptImportList.cpp:429 Src/wptImportList.cpp:438
#: Src/wptKeyManager.cpp:478 Src/wptKeyManager.cpp:489
-#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:222
msgid "Import"
msgstr "ƒCƒ“ƒ|[ƒg"
@@ -1676,35 +1681,35 @@
msgstr "o—̓tƒ@ƒCƒ‹–¼‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1450
-#: Src/wptFileManager.cpp:1977
+#: Src/wptFileManager.cpp:1978
msgid "Choose a Name for the Archive"
msgstr "ƒA[ƒJƒCƒu‚É–¼‘O‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
-#: Src/wptFileManager.cpp:1980
+#: Src/wptFileManager.cpp:1981
msgid "Invalid archive name. Exit."
msgstr "–³Œø‚ȃA[ƒJƒCƒu–¼BI—¹B"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1981 Src/wptFileManager.cpp:1989
+#: Src/wptFileManager.cpp:1982 Src/wptFileManager.cpp:1990
msgid "Encrypt Directory"
msgstr "ˆÃ†‰»ƒfƒBƒŒƒNƒgƒŠ"
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptFileManager.cpp:1988
+#: Src/wptFileManager.cpp:1989
msgid "Could not create zip archive."
msgstr "ˆ³kƒA[ƒJƒCƒu‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:69
# c:\oss\winpt\src\wptFileManagerDlg.cpp:129
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:159
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
msgid "File Encrypt"
msgstr "ƒtƒ@ƒCƒ‹‚̈Ɖ»"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:70
# c:\oss\winpt\src\wptFileManagerDlg.cpp:247
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
msgid "&Text Output"
msgstr "ƒeƒLƒXƒgo—Í(&T)"
@@ -1726,43 +1731,42 @@
# c:\oss\winpt\src\wptGPGOptDlg.cpp:79 c:\oss\winpt\src\wptGPGOptDlg.cpp:83
# c:\oss\winpt\src\wptGPGOptDlg.cpp:90 c:\oss\winpt\src\wptGPGOptDlg.cpp:96
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:580
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:292
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
msgid "Options"
msgstr "ƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:128
-#: Src/wptFileManagerDlg.cpp:158
+#: Src/wptFileManagerDlg.cpp:152
msgid "Please select at least one recipient."
msgstr "‚È‚‚Ä‚àˆêl‚ÌŽóMŽÒ‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:190
# c:\oss\winpt\src\wptKeyManager.cpp:408
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:283
#: Src/wptKeyManager.cpp:442
msgid "No valid OpenPGP data found."
msgstr "—LŒø‚ÈOpenPGPƒf[ƒ^‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptClipImportDlg.cpp:180
# c:\oss\winpt\src\wptKeyManager.cpp:427
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileManagerDlg.cpp:230
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
#: Src/wptKeyManager.cpp:467
msgid "Key Import"
msgstr "ƒL[‚̃Cƒ“ƒ|[ƒg"
-#: Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:216
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr "%s ‚É‚Í %d ƒL[‚ª‚ ‚è‚Ü‚·B"
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
-#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:498
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptClipImportDlg.cpp:219
-#: Src/wptFileManagerDlg.cpp:247
+#: Src/wptFileManagerDlg.cpp:242
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1775,27 +1779,27 @@
"ƒL[‘®«ƒ_ƒCƒ„ƒƒO‚ð—˜—p‚µ‚ÄÝ’è‚·‚é‚ׂ«‚Å‚·B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:246
-#: Src/wptFileManagerDlg.cpp:286 Src/wptFileManagerDlg.cpp:338
+#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
msgid "File Sign"
msgstr "–¼ƒtƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:248
-#: Src/wptFileManagerDlg.cpp:288
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Normal Signature"
msgstr "•’Ê‚È–¼(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:249
-#: Src/wptFileManagerDlg.cpp:289
+#: Src/wptFileManagerDlg.cpp:284
msgid "&Detached Signature"
msgstr "ƒfƒ^ƒbƒ`ƒh–¼(&D)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:250
-#: Src/wptFileManagerDlg.cpp:290
+#: Src/wptFileManagerDlg.cpp:285
msgid "&Cleartext Signature"
msgstr "•½•ª–¼(&C)"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:136
-#: Src/wptFileManagerDlg.cpp:291
+#: Src/wptFileManagerDlg.cpp:286
msgid "Signature mode"
msgstr "–¼‚̃‚[ƒh"
@@ -1815,39 +1819,39 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1097
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1115
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
#: Src/wptKeyManager.cpp:722 Src/wptKeyManager.cpp:823
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManagerDlg.cpp:1678
-#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1688 Src/wptKeyManagerDlg.cpp:1716
+#: Src/wptKeyManagerDlg.cpp:1727 Src/wptKeyManagerDlg.cpp:1742
#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
-#: Src/wptFileManagerDlg.cpp:399
+#: Src/wptFileManagerDlg.cpp:387
msgid "0 Objects marked"
msgstr "ƒ[ƒƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
-#: Src/wptFileManagerDlg.cpp:403
+#: Src/wptFileManagerDlg.cpp:391
#, c-format
msgid "%d Object(s) marked"
msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
+#: Src/wptFileManagerDlg.cpp:495 Src/wptMainProc.cpp:529
msgid "File Manager (use drag & drop to add files)"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ[(ƒhƒ‰ƒbƒOEƒAƒ“ƒhEƒhƒƒbƒv‚ðŽg—p‚µ‚ĒljÁ‚·‚é)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
-#: Src/wptMainProc.cpp:421
+#: Src/wptFileManagerDlg.cpp:499 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptMainProc.cpp:393
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
+#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:968
msgid "View"
msgstr "ƒrƒ…["
@@ -1857,62 +1861,62 @@
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:134
# c:\oss\winpt\src\wptClipEncryptDlg.cpp:168
# c:\oss\winpt\src\wptMainProc.cpp:153 c:\oss\winpt\src\wptMainProc.cpp:223
-#: Src/wptFileManagerDlg.cpp:509 Src/wptFileManagerDlg.cpp:586
+#: Src/wptFileManagerDlg.cpp:503 Src/wptFileManagerDlg.cpp:579
msgid "Encrypt into ZIP"
msgstr "ZIP‚ɈƉ»‚·‚é"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:357
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Sign"
msgstr "–¼(&S)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:358
# c:\oss\winpt\src\wptFileManagerDlg.cpp:404
# c:\oss\winpt\src\wptMainProc.cpp:404 c:\oss\winpt\src\wptMainProc.cpp:408
-#: Src/wptFileManagerDlg.cpp:512 Src/wptFileManagerDlg.cpp:590
-#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
+#: Src/wptFileManagerDlg.cpp:506 Src/wptFileManagerDlg.cpp:583
+#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:403
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:359
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:507
msgid "&Verify"
msgstr "Šm”F‚·‚é(&V)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:361
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:508
msgid "S&ymmetric"
msgstr "‹¤’ʈƉ»(&Y)"
# c:\oss\winpt\src\wptClipImportDlg.cpp:181
# c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:509
msgid "&Import"
msgstr "ƒCƒ“ƒ|[ƒg(&I)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:363
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:510
msgid "E&xport"
msgstr "ƒGƒNƒXƒ|[ƒg(&X)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
+#: Src/wptFileManagerDlg.cpp:511 Src/wptMainProc.cpp:395
msgid "Exit"
msgstr "I—¹"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptFileManagerDlg.cpp:518
+#: Src/wptFileManagerDlg.cpp:512
msgid "&Reset"
msgstr "‰Šú‰»(&R)"
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:513
msgid "Always on Top"
msgstr "‚¢‚‚àÅ‘O–Ê"
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:515
msgid "&Select All"
msgstr "‘S‚Ä‚ð‘I‘ð‚·‚é(&S)"
@@ -1936,67 +1940,67 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptFileManagerDlg.cpp:522
+#: Src/wptFileManagerDlg.cpp:516
msgid "&Preferences"
msgstr "ƒJƒXƒ^ƒ€Ý’è(&P)"
-#: Src/wptFileManagerDlg.cpp:523 Src/wptFileManagerDlg.cpp:593
+#: Src/wptFileManagerDlg.cpp:517 Src/wptFileManagerDlg.cpp:586
msgid "Send as Mail"
msgstr "ƒ[ƒ‹‚Æ‚µ‚Ä‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptFileManagerDlg.cpp:524
+#: Src/wptFileManagerDlg.cpp:518
msgid "&List Packets"
msgstr "ƒpƒPƒbƒg‚̈ꗗ‚Ђ傤(&L)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:360
-#: Src/wptFileManagerDlg.cpp:526
+#: Src/wptFileManagerDlg.cpp:520
msgid "&Wipe"
msgstr "íœ(&W)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:406
-#: Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:585
msgid "Wipe"
msgstr "Žæ‚èÁ‚µ"
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:587
msgid "List Packets"
msgstr "ƒpƒPƒbƒg‚ðƒŠƒXƒg‚·‚é"
# c:\oss\winpt\src\wptMDSumDlg.cpp:52
-#: Src/wptFileManagerDlg.cpp:626
+#: Src/wptFileManagerDlg.cpp:619
msgid "&Calc Digest"
msgstr "ƒ_ƒCƒWƒFƒXƒg‚ðŒvŽZ‚·‚é(&C)"
-#: Src/wptFileManagerDlg.cpp:637
+#: Src/wptFileManagerDlg.cpp:630
msgid "This command requires admin privileges.\n"
msgstr "‚±‚̃Rƒ}ƒ“ƒh‚ð—˜—p‚·‚é‚Ì‚ÉŠÇ—ŽÒ“ÁŒ ‚ª•K—v‚Å‚·B\n"
# c:\oss\winpt\src\wptKeysigDlg.cpp:82
-#: Src/wptFileManagerDlg.cpp:787
+#: Src/wptFileManagerDlg.cpp:780
msgid "Are you sure you want to secure delete these files?"
msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘S휂µ‚Ü‚·‚©Hn"
-#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
+#: Src/wptFileManagerDlg.cpp:781 Src/wptMainProc.cpp:108
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:782 Src/wptMainProc.cpp:109
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:832
+#: Src/wptFileManagerDlg.cpp:825
msgid "Operation Status: Error"
msgstr "‘€ìó‹µFƒGƒ‰["
# c:\oss\winpt\src\wptFileManagerDlg.cpp:550
-#: Src/wptFileManagerDlg.cpp:833
+#: Src/wptFileManagerDlg.cpp:826
msgid "Operation Status: Done."
msgstr "‘€ìó‹µFŠ®—¹B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:573
-#: Src/wptFileManagerDlg.cpp:876
+#: Src/wptFileManagerDlg.cpp:869
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -2065,7 +2069,7 @@
msgstr "WinPTʼn‚̃Xƒ^[ƒg"
# c:\oss\winpt\src\wptGPG.cpp:734
-#: Src/wptGPG.cpp:830
+#: Src/wptGPG.cpp:844
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -2076,23 +2080,23 @@
"‚±‚Ì‘®«‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:737
-#: Src/wptGPG.cpp:833
+#: Src/wptGPG.cpp:847
msgid "GPG Information"
msgstr "GPGƒCƒ“ƒtƒH"
# c:\oss\winpt\src\wptGPG.cpp:741
-#: Src/wptGPG.cpp:837
+#: Src/wptGPG.cpp:851
msgid "Could not reset read-only state."
msgstr "ƒŠ[ƒhƒIƒ“ƒŠ[ó‘Ô‚ð‰Šú‰»‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:178 c:\oss\winpt\src\wptGPG.cpp:742
# c:\oss\winpt\src\wptGPG.cpp:1029 c:\oss\winpt\src\wptGPG.cpp:1038
-#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
+#: Src/wptGPG.cpp:852
msgid "GPG Error"
msgstr "GPGƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:757
-#: Src/wptGPG.cpp:850
+#: Src/wptGPG.cpp:864
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -2107,7 +2111,7 @@
"ƒvƒƒOƒ‰ƒ€‚ª‚»‚ê‚ðŠJ‚¢‚½‚½‚ß‚Æl‚¦‚ç‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptGPG.cpp:762
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:869
msgid "GPG Warning"
msgstr "GPGŒx"
@@ -2131,20 +2135,19 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptGPG.cpp:879 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
-#: Src/wptGPGPrefsDlg.cpp:232 Src/wptGPGPrefsDlg.cpp:238
-#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:248
-#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:268
-#: Src/wptKeyEditDlgs.cpp:1713 Src/wptKeyManagerDlg.cpp:997
-#: Src/wptMainProc.cpp:444 Src/wptPreferencesDlg.cpp:225
-#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
-#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
-#: Src/wptRegistry.cpp:596
+#: Src/wptGPG.cpp:893 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
+#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
+#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
+#: Src/wptKeyEditDlgs.cpp:1713 Src/wptMainProc.cpp:416
+#: Src/wptPreferencesDlg.cpp:225 Src/wptPreferencesDlg.cpp:270
+#: Src/wptPreferencesDlg.cpp:282 Src/wptPreferencesDlg.cpp:295
+#: Src/wptPreferencesDlg.cpp:326 Src/wptRegistry.cpp:596
msgid "Preferences"
msgstr "ƒJƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptGPG.cpp:880
+#: Src/wptGPG.cpp:894
#, c-format
msgid ""
"%s does not exit.\n"
@@ -2154,47 +2157,47 @@
"‚±‚̃fƒBƒŒƒNƒgƒŠ[‚ð쬂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:863
-#: Src/wptGPG.cpp:908
+#: Src/wptGPG.cpp:922
msgid "Please choose your Public Keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:866 c:\oss\winpt\src\wptGPG.cpp:886
-#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:925 Src/wptGPG.cpp:947
msgid "No keyring was chosen. Exit."
msgstr "ƒL[ƒŠƒ“ƒO‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñBI—¹B"
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPG.cpp:918
+#: Src/wptGPG.cpp:932
msgid "Overwrite old public keyring?"
msgstr "ŒÃ‚¢ŒöŠJŒ®‚ðã‘‚«‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:877 c:\oss\winpt\src\wptGPG.cpp:896
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:959
msgid "Could not copy file."
msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:883
-#: Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:944
msgid "Please choose your Secret Keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:891
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:953
msgid "Overwrite old secret keyring?"
msgstr "ŒÃ‚¢”é–§ƒL[ƒŠƒ“ƒO‚ðã‘‚«‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:942 c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:999 Src/wptGPG.cpp:1088 Src/wptGPG.cpp:1101
msgid "Backup"
msgstr "ƒoƒbƒNƒAƒbƒv"
# c:\oss\winpt\src\wptGPG.cpp:942
-#: Src/wptGPG.cpp:989
+#: Src/wptGPG.cpp:999
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "ˆÈ‰º‚̃oƒbƒNƒAƒbƒvƒL[ƒŠƒ“ƒO‚ª \"%s\" Ž¸”s‚µ‚Ü‚µ‚½B"
-#: Src/wptGPG.cpp:1079
+#: Src/wptGPG.cpp:1089
#, fuzzy, c-format
msgid ""
"The backup drive '%s' does not seems to be accessable.\n"
@@ -2204,16 +2207,11 @@
"‘±‚¯‚é‚̂Ƀhƒ‰ƒCƒu‚ð‘}“ü‚Ü‚½‚̓`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:1101
#, c-format
msgid "Invalid backup mode %d"
msgstr "–³Œø‚ȃoƒbƒNƒAƒbƒvƒ‚[ƒh %d"
-# c:\oss\winpt\src\wptGPG.cpp:1029
-#: Src/wptGPG.cpp:1118
-msgid "No GPG error description available."
-msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
-
#: Src/wptGPGME.cpp:278
msgid "Error during verification process"
msgstr "Šm”F’iŠK‚ŃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
@@ -2254,57 +2252,57 @@
msgstr "—LŒø‚È–¼i–³Œø‚ȃL[j"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:44
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:50 Src/wptGPGOptDlg.cpp:100
msgid "Could not load GnuPG config file!"
msgstr "GnuPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:762
-#: Src/wptGPGOptDlg.cpp:49 Src/wptGPGOptDlg.cpp:70 Src/wptGPGOptDlg.cpp:76
-#: Src/wptGPGOptDlg.cpp:81 Src/wptGPGOptDlg.cpp:85 Src/wptGPGOptDlg.cpp:92
-#: Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:51 Src/wptGPGOptDlg.cpp:72 Src/wptGPGOptDlg.cpp:78
+#: Src/wptGPGOptDlg.cpp:83 Src/wptGPGOptDlg.cpp:87 Src/wptGPGOptDlg.cpp:94
+#: Src/wptGPGOptDlg.cpp:100
msgid "GPG Config"
msgstr "GPG‚±‚¤‚¹‚¢"
# c:\oss\winpt\src\wptGPG.cpp:737
-#: Src/wptGPGOptDlg.cpp:54
+#: Src/wptGPGOptDlg.cpp:56
msgid "GnuPG Configuration File"
msgstr "GnuPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹"
# c:\oss\winpt\src\wptClipEditDlg.cpp:48 c:\oss\winpt\src\wptGPGOptDlg.cpp:49
# c:\oss\winpt\src\wptTextInputDlg.cpp:83
-#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+#: Src/wptGPGOptDlg.cpp:58 Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "ƒ[ƒh(&L)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptGPGOptDlg.cpp:57
+#: Src/wptGPGOptDlg.cpp:59
#, fuzzy
msgid "&Exit"
msgstr "I—¹"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:68
-#: Src/wptGPGOptDlg.cpp:70
+#: Src/wptGPGOptDlg.cpp:72
msgid "The 'gpg.conf' file is not loaded."
msgstr "'gpg.conf' ƒtƒ@ƒCƒ‹‚ªƒ[ƒh‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:74
-#: Src/wptGPGOptDlg.cpp:76
+#: Src/wptGPGOptDlg.cpp:78
msgid "File contains invalid GnuPG keywords!"
msgstr "ƒtƒ@ƒCƒ‹‚É–³Œø‚ÈGnuPGƒL[ƒ[ƒh‚ª“ü‚Á‚Ä‚¢‚Ü‚·I"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:44
-#: Src/wptGPGOptDlg.cpp:81
+#: Src/wptGPGOptDlg.cpp:83
msgid "Could not save GnuPG config file."
msgstr "GnuPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:83
-#: Src/wptGPGOptDlg.cpp:85
+#: Src/wptGPGOptDlg.cpp:87
msgid "Successfully saved."
msgstr "³‚µ‚•Û‘¶‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:89
-#: Src/wptGPGOptDlg.cpp:91
+#: Src/wptGPGOptDlg.cpp:93
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -2315,99 +2313,99 @@
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:61
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
# c:\oss\winpt\src\wptMainProc.cpp:572
-#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
-#: Src/wptMainProc.cpp:605
+#: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:577
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:63
-#: Src/wptGPGPrefsDlg.cpp:152
+#: Src/wptGPGPrefsDlg.cpp:154
msgid "GnuPG home directory (where both keyrings are located)"
msgstr "GnuPGΰÑÃÞ¨Ú¸ÄØi—¼•û‚Ì·°Øݸނª‚ ‚éêŠj"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:67
-#: Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "GnuPG exe file location (full path with added gpg.exe)"
msgstr "GnuPG‚ÌŽÀş²Ù‚ÌêŠiÌÙÊß½‚Égpg.exe’ljÁ‚³‚ꂽ•¨j"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:69
-#: Src/wptGPGPrefsDlg.cpp:156
+#: Src/wptGPGPrefsDlg.cpp:158
msgid "Locale directory (to access the translation files)"
msgstr "'Locale'ƒfƒBƒŒƒNƒgƒŠi–|–󂵂½ƒtƒ@ƒCƒ‹‚ðƒAƒNƒZƒX‚·‚邽‚ßj"
-#: Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptGPGPrefsDlg.cpp:159
msgid "Ask for the signature class during key sign"
msgstr "–¼Žž‚ɃVƒOƒlƒCƒ`ƒƒƒNƒ‰ƒX‚ð—v‹‚·‚é"
-#: Src/wptGPGPrefsDlg.cpp:158
+#: Src/wptGPGPrefsDlg.cpp:160
msgid "Allow to set an expiration date for signatures"
msgstr "–¼‚Ì—LŒøŠúŒÀÝ’è‚ð‹–‰Â‚·‚éB"
# c:\oss\winpt\src\wptErrors.cpp:68
-#: Src/wptGPGPrefsDlg.cpp:159
+#: Src/wptGPGPrefsDlg.cpp:161
msgid "Comment in armored files"
msgstr "ƒAƒ‹ƒ‚[ƒ‹ƒhƒtƒ@ƒCƒ‹—p‚̂ɃRƒƒ“ƒg"
# c:\oss\winpt\src\wptFileManager.cpp:1453
# c:\oss\winpt\src\wptFileManager.cpp:1464
-#: Src/wptGPGPrefsDlg.cpp:160
+#: Src/wptGPGPrefsDlg.cpp:162
msgid "Encrypt to this key"
msgstr "‚±‚̃L[‚ƈƉ»"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
-#: Src/wptGPGPrefsDlg.cpp:161
+#: Src/wptGPGPrefsDlg.cpp:163
msgid "General GPG options"
msgstr "GPGˆê”ʃIƒvƒVƒ‡ƒ“"
-#: Src/wptGPGPrefsDlg.cpp:162 Src/wptGPGPrefsDlg.cpp:163
-#: Src/wptGPGPrefsDlg.cpp:164 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:164 Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:166 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr "ŠJ‚..."
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:167
msgid "&Overwrite default settings"
msgstr "‹K’èÝ’è‚ðã‘‚µ‚Ü‚·(&O)"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:107
-#: Src/wptGPGPrefsDlg.cpp:219
+#: Src/wptGPGPrefsDlg.cpp:221
msgid "Please enter the GnuPG home directory."
msgstr "GnuPGƒz[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:154
-#: Src/wptGPGPrefsDlg.cpp:231
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Could not save 'HomeDir' in the registry."
msgstr "ƒŒƒWƒXƒgƒŠ‚É'HomeDir'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:158
-#: Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:239
msgid "Please enter where GPG.exe is located."
msgstr "GPG.exeƒtƒ@ƒCƒ‹‚Ì‚ ‚éꊂð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:162
-#: Src/wptGPGPrefsDlg.cpp:242
+#: Src/wptGPGPrefsDlg.cpp:244
msgid "Could not find the GPG program in this directory."
msgstr "GPGƒvƒ‰ƒOƒ‰ƒ€‚ª‚±‚̃fƒBƒŒƒNƒgƒŠ‚É“ü‚Á‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:166
-#: Src/wptGPGPrefsDlg.cpp:247
+#: Src/wptGPGPrefsDlg.cpp:249
msgid "Could not save 'gpgProgram' in the registry"
msgstr "ƒŒƒWƒXƒgƒŠ‚É'gpgProgram'‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:180
-#: Src/wptGPGPrefsDlg.cpp:267
+#: Src/wptGPGPrefsDlg.cpp:269
msgid "Could not get GPG config file"
msgstr "GPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ðŽæ“¾‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:210
-#: Src/wptGPGPrefsDlg.cpp:317
+#: Src/wptGPGPrefsDlg.cpp:319
msgid "Choose GPG Home Directory"
msgstr "GPG‚̃z[ƒ€ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é"
# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:217
-#: Src/wptGPGPrefsDlg.cpp:345
+#: Src/wptGPGPrefsDlg.cpp:343
msgid "Choose GPG Binary"
msgstr "GPGƒoƒCƒiƒŠ‚ð‘I‘ð‚·‚é"
@@ -2493,23 +2491,23 @@
#: Src/wptKeyManager.cpp:750 Src/wptKeyManager.cpp:759
#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:796
#: Src/wptKeyManager.cpp:823 Src/wptKeyManager.cpp:828
-#: Src/wptKeyManager.cpp:852 Src/wptKeyManager.cpp:857
-#: Src/wptKeyManager.cpp:871 Src/wptKeyManager.cpp:928
-#: Src/wptKeyManager.cpp:933 Src/wptKeyManager.cpp:990
-#: Src/wptKeyManager.cpp:1023 Src/wptKeyManager.cpp:1107
-#: Src/wptKeyManagerDlg.cpp:1326 Src/wptKeyManagerDlg.cpp:1337
-#: Src/wptKeyManagerDlg.cpp:1347 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1694
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1712
-#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1733
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1765
-#: Src/wptKeyManagerDlg.cpp:1797 Src/wptKeyManagerDlg.cpp:1856
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:930
+#: Src/wptKeyManager.cpp:935 Src/wptKeyManager.cpp:992
+#: Src/wptKeyManager.cpp:1025 Src/wptKeyManager.cpp:1109
+#: Src/wptKeyManagerDlg.cpp:1324 Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1345 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptKeyManagerDlg.cpp:1673 Src/wptKeyManagerDlg.cpp:1688
+#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1706
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyManagerDlg.cpp:1759
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1856
#: Src/wptKeyManagerDlg.cpp:1874 Src/wptKeyManagerDlg.cpp:1879
-#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1955
-#: Src/wptKeyManagerDlg.cpp:1960 Src/wptKeyManagerDlg.cpp:2074
-#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
-#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1960
+#: Src/wptKeyManagerDlg.cpp:1965 Src/wptKeyManagerDlg.cpp:2079
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
+#: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
+#: Src/wptMainProc.cpp:391 Src/wptMainProc.cpp:540 Src/wptMainProc.cpp:548
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2614,8 +2612,8 @@
#: Src/wptKeyEditDlgs.cpp:1483 Src/wptKeyEditDlgs.cpp:1514
#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1758
#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
-#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
-#: Src/wptKeysigDlg.cpp:207
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
+#: Src/wptKeysigDlg.cpp:215
msgid "Revoked"
msgstr "–³Œø‚É‚È‚è‚Ü‚µ‚½"
@@ -2627,7 +2625,7 @@
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:259
#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1346
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
+#: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
msgid "Expired"
msgstr "ŠúŒÀØ‚ê"
@@ -2654,9 +2652,9 @@
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:166
+#: Src/wptVerifyList.cpp:173
msgid "User ID"
msgstr "ƒ†[ƒU[ID"
@@ -2665,7 +2663,7 @@
# c:\oss\winpt\src\wptKeylist.cpp:51
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:42
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2676,10 +2674,10 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1072
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
-#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:172
msgid "Key ID"
msgstr "ƒL[‚ÌID"
@@ -2690,14 +2688,14 @@
# c:\oss\winpt\src\wptSigList.cpp:44
#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1073
#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "ì¬"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
msgid "Type"
msgstr "Ží—Þ"
@@ -2713,7 +2711,7 @@
# c:\oss\winpt\src\WinPT.cpp:247 c:\oss\winpt\src\wptGPG.cpp:864
# c:\oss\winpt\src\wptGPG.cpp:884
-#: Src/wptKeyCache.cpp:813
+#: Src/wptKeyCache.cpp:818
msgid "Load GPG Keyrings..."
msgstr "GPGƒL[ƒŠƒ“ƒO‚ðƒ[ƒh‚·‚é..."
@@ -2789,7 +2787,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:225
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:320
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:361
msgid "Passphrase"
msgstr "ƒpƒXƒtƒŒ[ƒY"
@@ -2862,8 +2860,8 @@
#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:722
#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1516
#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
-#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:380
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "GnuPG‚Ìó‘Ô"
@@ -3020,7 +3018,7 @@
#: Src/wptKeyEditDlgs.cpp:898 Src/wptKeyEditDlgs.cpp:930
#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1334
#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1467
-#: Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:1705
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -3039,7 +3037,7 @@
# c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:58
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:189
#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:370
+#: Src/wptKeyPropsDlg.cpp:371
msgid "Change Ownertrust"
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚Ì•ÏX"
@@ -3088,7 +3086,7 @@
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Ú×"
@@ -3100,7 +3098,7 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:918 c:\oss\winpt\src\wptKeylist.cpp:42
# c:\oss\winpt\src\wptKeylist.cpp:53
#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "—LŒø«"
@@ -3368,7 +3366,7 @@
msgstr "‚±‚Ì–¼‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚Å—ˆ‚é‚à‚Ì‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeysignDlg.cpp:325
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:466
msgid "Key successfully signed."
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
@@ -3398,7 +3396,7 @@
msgid "Command>"
msgstr "ƒRƒ}ƒ“ƒh"
-#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:589
#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "•Â‚¶‚é(&C)"
@@ -3475,8 +3473,8 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:81
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:86
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
-#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:1926 Src/wptKeyPropsDlg.cpp:286
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -3509,18 +3507,18 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:244 c:\oss\winpt\src\wptKeygenDlg.cpp:252
# c:\oss\winpt\src\wptKeygenDlg.cpp:289 c:\oss\winpt\src\wptKeygenDlg.cpp:311
# c:\oss\winpt\src\wptKeygenDlg.cpp:392
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
-#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:416 Src/wptKeygenDlg.cpp:421
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:438
-#: Src/wptKeygenDlg.cpp:446 Src/wptKeygenDlg.cpp:460 Src/wptKeygenDlg.cpp:467
-#: Src/wptKeygenDlg.cpp:477 Src/wptKeygenDlg.cpp:498 Src/wptKeygenDlg.cpp:581
-#: Src/wptKeyManagerDlg.cpp:1788 Src/wptPassphraseDlg.cpp:147
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:296 Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:414 Src/wptKeygenDlg.cpp:419
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
+#: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
+#: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptPassphraseDlg.cpp:147
#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
# c:\oss\winpt\src\wptKeygenDlg.cpp:60
-#: Src/wptKeygenDlg.cpp:286
+#: Src/wptKeygenDlg.cpp:284
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -3538,58 +3536,58 @@
"Ž©•ª‚̃L[ƒŠƒ“ƒO‚ðƒoƒbƒNƒAƒbƒv‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:291
+#: Src/wptKeygenDlg.cpp:289
msgid "WARNING - Important hint"
msgstr "Œx - d—v‚ȃqƒ“ƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:67
-#: Src/wptKeygenDlg.cpp:293
+#: Src/wptKeygenDlg.cpp:291
msgid "Destination for Public Keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚Ì‚ ‚Äæ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:72 c:\oss\winpt\src\wptKeygenDlg.cpp:80
-#: Src/wptKeygenDlg.cpp:299 Src/wptKeygenDlg.cpp:308
+#: Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
#, c-format
msgid "Could not copy %s -> %s"
msgstr "ˆÈ‰º‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½ %s -> %s"
# c:\oss\winpt\src\wptKeygenDlg.cpp:75
-#: Src/wptKeygenDlg.cpp:302
+#: Src/wptKeygenDlg.cpp:300
msgid "Destination for Secret Keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚Ì‚ ‚Äæ"
# c:\oss\winpt\src\wptKeygenDlg.cpp:95
-#: Src/wptKeygenDlg.cpp:324
+#: Src/wptKeygenDlg.cpp:322
msgid "DSA and ELG (default)"
msgstr "DSA ‹y‚Ñ ELG (Šù’è)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:96
-#: Src/wptKeygenDlg.cpp:325
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and RSA"
msgstr "DSA ‹y‚Ñ RSA"
# c:\oss\winpt\src\wptKeygenDlg.cpp:97
-#: Src/wptKeygenDlg.cpp:326
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA sign only"
msgstr "DSA–¼‚Ì‚Ý"
# c:\oss\winpt\src\wptKeygenDlg.cpp:98
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:325
msgid "RSA sign only"
msgstr "RSA–¼‚Ì‚Ý"
# c:\oss\winpt\src\wptKeygenDlg.cpp:99
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign and encrypt"
msgstr "RSA –¼‹y‚шƉ»"
# c:\oss\winpt\src\wptKeygenDlg.cpp:100
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA and RSA (PGP)"
msgstr "RSA ‹y‚Ñ RSA (PGP)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:144
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:371
#, fuzzy
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
@@ -3599,84 +3597,84 @@
"ƒZ[ƒW‚ª‚Ђ傤‚¶‚·‚é‚Ü‚Å‚¨‘Ò‚¿‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:146
-#: Src/wptKeygenDlg.cpp:375
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr "ƒTƒuƒL[‚̃rƒbƒg’PˆÊ‚Å‚Ì‘å‚«‚³(&B)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:147
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "ŽÀ–¼(&R)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:153
-#: Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr "ƒL[‚ÌŽí—Þ(&T)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:189
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:413
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "–³Œø‚È’lB—LŒø”͈͂Í1024`4096ƒrƒbƒg‚Å‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:194
-#: Src/wptKeygenDlg.cpp:420
+#: Src/wptKeygenDlg.cpp:418
msgid "Do you really need such a large key?"
msgstr "‚±‚̂悤‚È’·‚¢ƒL[‚ð–{“–‚É‚¢‚è‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:556
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
+#: Src/wptKeygenDlg.cpp:428 Src/wptKeygenDlg.cpp:561
msgid "Please do not enter the email address in the name field."
msgstr "–¼‘O‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:205 c:\oss\winpt\src\wptKeygenDlg.cpp:388
-#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:568
msgid "Please enter a valid email address."
msgstr "—LŒø‚È“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:211
-#: Src/wptKeygenDlg.cpp:445
+#: Src/wptKeygenDlg.cpp:443
msgid "Please do NOT enter the email address in the comment field."
msgstr "ƒRƒƒ“ƒg‚Ì•”•ª‚É“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü‚ê‚È‚¢‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:342
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeygenDlg.cpp:222
-#: Src/wptKeygenDlg.cpp:476 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:474 Src/wptKeyRevokeDlg.cpp:180
msgid "Please enter the passphrase."
msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:292 c:\oss\winpt\src\wptKeygenDlg.cpp:416
-#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeygenDlg.cpp:499 Src/wptKeygenDlg.cpp:600
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:540
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:541
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:542
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:543
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:546
+#: Src/wptKeygenDlg.cpp:544
#, fuzzy
msgid ""
"Every key pair must have a name associated with it. The name and\n"
@@ -3688,7 +3686,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:545
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3701,14 +3699,14 @@
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1057
# c:\oss\winpt\src\wptKeygenDlg.cpp:378 c:\oss\winpt\src\wptKeygenDlg.cpp:383
# c:\oss\winpt\src\wptKeygenDlg.cpp:389 c:\oss\winpt\src\wptKeygenDlg.cpp:413
-#: Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
-#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:598
-#: Src/wptKeyManagerDlg.cpp:1811
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeygenDlg.cpp:557 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:569 Src/wptKeygenDlg.cpp:575 Src/wptKeygenDlg.cpp:596
+#: Src/wptKeyManagerDlg.cpp:1805
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:576
+#: Src/wptKeygenDlg.cpp:574
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3811,15 +3809,15 @@
msgstr "ƒL[ƒyƒA"
# c:\oss\winpt\src\wptKeylist.cpp:41 c:\oss\winpt\src\wptKeylist.cpp:52
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1005
msgid "Cipher"
msgstr "ˆÃ†"
# c:\oss\winpt\src\wptKeylist.cpp:54 c:\oss\winpt\src\wptVerifyList.cpp:78
# c:\oss\winpt\src\wptVerifyList.cpp:86
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
-#: Src/wptVerifyList.cpp:164
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:171
msgid "Trust"
msgstr "M—p"
@@ -3827,7 +3825,7 @@
# c:\oss\winpt\src\wptFileManager.cpp:1030
# c:\oss\winpt\src\wptKeylist.cpp:569 c:\oss\winpt\src\wptPassphraseCB.cpp:75
# c:\oss\winpt\src\wptVerifyList.cpp:160
-#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:125
msgid "Invalid User ID"
msgstr "–³Œø‚ȃ†[ƒU[ID"
@@ -4026,58 +4024,58 @@
msgstr "'0x%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:851
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:929
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "ƒL[ƒŠƒ“ƒO‚É‚ ‚é‚·‚ׂẴL[‚ð–{“–‚ɃŠƒtƒŒƒbƒVƒ…‚µ‚½‚¢‚Å‚·‚ªH"
# c:\oss\winpt\src\wptKeyManager.cpp:727
-#: Src/wptKeyManager.cpp:932
+#: Src/wptKeyManager.cpp:934
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:1018
+#: Src/wptKeyManager.cpp:1020
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:74
-#: Src/wptKeyManager.cpp:1084 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. ——R‚Í–¾Ž¦‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:75
-#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:86
msgid "1. Key has been compromised"
msgstr "1. ƒL[‚ÍM—p‚Å‚«‚È‚‚È‚Á‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:76
-#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1088 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. ƒL[‚Í”pŽ~‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:77
-#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1089 Src/wptKeyRevokeDlg.cpp:88
msgid "3. Key is no longer used"
msgstr "3. ƒL[‚Í‚à‚Í‚âŽg‚í‚ê‚Ä‚¢‚Ü‚¹‚ñ "
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1026
msgid "Paste Key from Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
@@ -4094,12 +4092,12 @@
msgstr "‹K’èƒL[‚Í: 0x%s"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:532
+#: Src/wptKeyManagerDlg.cpp:529
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:533
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4110,71 +4108,71 @@
# c:\oss\winpt\src\wptKeylist.cpp:39 c:\oss\winpt\src\wptKeylist.cpp:49
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:43
# c:\oss\winpt\src\wptSigList.cpp:45 c:\oss\winpt\src\wptVerifyList.cpp:87
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:969
msgid "Key"
msgstr "ƒL["
# c:\oss\winpt\src\wptGroupsDlg.cpp:49
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
+#: Src/wptKeyManagerDlg.cpp:970 Src/wptKeyManagerDlg.cpp:1361
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:973
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:976
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:978
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Normal"
msgstr "•’Ê(&N)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1033
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1029
msgid "&List Signatures"
msgstr "–¼‚̈ꗗ‚Ђ傤(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:578
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:958
# c:\oss\winpt\src\wptKeyTrustPathDlg.cpp:126
-#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
+#: Src/wptKeyManagerDlg.cpp:989 Src/wptKeyManagerDlg.cpp:1722
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4182,118 +4180,140 @@
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Export..."
msgstr "ƒGƒLƒXƒ|[ƒg(&E)..."
# c:\oss\winpt\src\wptClipImportDlg.cpp:181
# c:\oss\winpt\src\wptFileManagerDlg.cpp:362
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Import..."
msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
-#: Src/wptKeysigDlg.cpp:419
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "‘®«(&P)"
+# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
+#: Src/wptKeyManagerDlg.cpp:993
+#, fuzzy
+msgid "GPG &Options"
+msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
+
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:61
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1071
+# c:\oss\winpt\src\wptMainProc.cpp:572
+#: Src/wptKeyManagerDlg.cpp:994
+#, fuzzy
+msgid "&GPG Preferences"
+msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
+
+# c:\oss\winpt\src\wptMainProc.cpp:566
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
+#: Src/wptKeyManagerDlg.cpp:995
+#, fuzzy
+msgid "&WinPT Preferences"
+msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
+
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:997
msgid "E&xport Secret Key"
msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Re&load Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:999
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Refresh &Keys (Keyserver)"
msgstr "ƒL[‚ðƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&K)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:586
# c:\oss\winpt\src\wptTextInputDlg.cpp:47
-#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1001 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy User ID to Clipboard"
msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key ID to Clipboard"
msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Fingerprint to Clipboard"
msgstr "ƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key Info to Clipboard"
msgstr "ƒL[ƒCƒ“ƒtƒH‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:1024
#, fuzzy
msgid "Copy E-Mail to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Copy Key to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1028
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Re&fresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Key..."
msgstr "ƒL[..."
@@ -4303,24 +4323,24 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:45
# c:\oss\winpt\src\wptSigList.cpp:41 c:\oss\winpt\src\wptVerifyList.cpp:79
# c:\oss\winpt\src\wptVerifyList.cpp:88
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1043
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1047
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:1050
+#: Src/wptKeyManagerDlg.cpp:1048
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:1051
+#: Src/wptKeyManagerDlg.cpp:1049
msgid "Add"
msgstr "’ljÁ"
@@ -4339,11 +4359,11 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1052
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1333
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -4352,66 +4372,91 @@
"‚È‚‚Ä‚àˆê‚‚̃L[‚ðÅ‚M—pŽÒƒL[‚Æ‚µ‚Äݒ肵‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeyManagerDlg.cpp:1364
+#: Src/wptKeyManagerDlg.cpp:1362
msgid "&Show"
msgstr "‚Ђ傤‚¶(&S)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptKeyManagerDlg.cpp:1365
+#: Src/wptKeyManagerDlg.cpp:1363
msgid "&New..."
msgstr "ŠJ‚(&N)..."
# c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1475
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1479
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1483
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1487
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1491
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1497
+#: Src/wptKeyManagerDlg.cpp:1495
msgid "Copy key to clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:272
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:763
-#: Src/wptKeyManagerDlg.cpp:1501
+#: Src/wptKeyManagerDlg.cpp:1499
msgid "Paste key from clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1505
+#: Src/wptKeyManagerDlg.cpp:1503
msgid "Import key to keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1509
+#: Src/wptKeyManagerDlg.cpp:1507
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1643
+#: Src/wptKeyManagerDlg.cpp:1641
msgid "New"
msgstr "V‹Kì¬"
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:365 c:\oss\winpt\src\wptGPG.cpp:782
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:107
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:112
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:120
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:130
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:140
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:154
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:158
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:162
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:166
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:171
+# c:\oss\winpt\src\wptGPGPrefsDlg.cpp:180
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:581
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:185
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:234
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:245
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:257
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
+# c:\oss\winpt\src\wptRegistry.cpp:492
+#: Src/wptKeyManagerDlg.cpp:1643
+#, fuzzy
+msgid "Preferences..."
+msgstr "ƒJƒXƒ^ƒ€Ý’è"
+
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1655
+#: Src/wptKeyManagerDlg.cpp:1649
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4423,15 +4468,15 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
# c:\oss\winpt\src\wptKeysignDlg.cpp:320
# c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1687 Src/wptKeysignDlg.cpp:325
-#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
-#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
-#: Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeysignDlg.cpp:351
+#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
+#: Src/wptKeysignDlg.cpp:456 Src/wptKeysignDlg.cpp:461
+#: Src/wptKeysignDlg.cpp:466
msgid "Key Signing"
msgstr "ƒL[‚𖼂·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1703
+#: Src/wptKeyManagerDlg.cpp:1697
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4442,7 +4487,7 @@
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:118
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:140
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:151
-#: Src/wptKeyManagerDlg.cpp:1717 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyRevokeDlg.cpp:68
#: Src/wptKeyRevokeDlg.cpp:78 Src/wptKeyRevokeDlg.cpp:162
#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:172
#: Src/wptKeyRevokeDlg.cpp:181 Src/wptKeyRevokeDlg.cpp:191
@@ -4451,18 +4496,18 @@
msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1739
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Key Signature List"
msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1750 Src/wptKeyPropsDlg.cpp:282
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1766
+#: Src/wptKeyManagerDlg.cpp:1760
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4471,16 +4516,23 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1796
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "Smart Card support is not available."
msgstr "ƒXƒ}[ƒgƒJ[ƒh‚ɑΉž‚µ‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1065
# c:\oss\winpt\src\wptKeyserverDlg.cpp:298
-#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1813 Src/wptKeyserverDlg.cpp:580
msgid "Keyserver Access"
msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
+# c:\oss\winpt\src\wptMainProc.cpp:566
+# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
+#: Src/wptKeyManagerDlg.cpp:1821 Src/wptMainProc.cpp:571
+#: Src/wptPreferencesDlg.cpp:139
+msgid "WinPT Preferences"
+msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
+
# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
#: Src/wptKeyManagerDlg.cpp:1836
@@ -4522,12 +4574,12 @@
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1954
+#: Src/wptKeyManagerDlg.cpp:1959
msgid "No key was selected, select all by default."
msgstr "ƒL[‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñB‹K’è‘I‘ð‚Í All ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyManagerDlg.cpp:1959
+#: Src/wptKeyManagerDlg.cpp:1964
msgid "Keyserver refresh finished."
msgstr "ƒL[ƒT[ƒo[‚̃ŠƒtƒŒƒbƒVƒ…‚ªŠ®—¹‚µ‚Ü‚µ‚½B"
@@ -4538,8 +4590,8 @@
msgstr "‚‚¢‚ÉM—p‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:84 c:\oss\winpt\src\wptKeylist.cpp:701
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:239
-#: Src/wptVerifyList.cpp:302
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
+#: Src/wptVerifyList.cpp:309
msgid "Unknown"
msgstr "–³–¼"
@@ -4548,12 +4600,12 @@
msgid "Invalid"
msgstr "–³Œø"
-#: Src/wptKeyPropsDlg.cpp:204
+#: Src/wptKeyPropsDlg.cpp:205
#, c-format
msgid "Card-Type: %s\r\n"
msgstr "ƒJ[ƒhƒ^ƒCƒv: %s\r\n"
-#: Src/wptKeyPropsDlg.cpp:243
+#: Src/wptKeyPropsDlg.cpp:244
#, c-format
msgid ""
"Type: %s\r\n"
@@ -4577,26 +4629,26 @@
"%s\r\n"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyPropsDlg.cpp:282
+#: Src/wptKeyPropsDlg.cpp:283
msgid "&Change"
msgstr "•ÏX(&C)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyPropsDlg.cpp:283
+#: Src/wptKeyPropsDlg.cpp:284
msgid "&Revokers"
msgstr "–³Œø‰»‚«‚Ì‚¤(&R)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
-#: Src/wptKeyPropsDlg.cpp:284
+#: Src/wptKeyPropsDlg.cpp:285
msgid "Change &Password"
msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX(&P)"
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Photo-ID not validated."
msgstr "ƒtƒHƒgID—LŒø‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:171
-#: Src/wptKeyPropsDlg.cpp:354
+#: Src/wptKeyPropsDlg.cpp:355
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -4605,7 +4657,7 @@
"‚±‚ê‚ç‚̃L[‚ÌŠ—LŽÒ‚ÌM—Š(ownertrust)‚ð•ÏX‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:177
-#: Src/wptKeyPropsDlg.cpp:360
+#: Src/wptKeyPropsDlg.cpp:361
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -4617,12 +4669,12 @@
"–{“–‚ÉŒp‘±‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:208
-#: Src/wptKeyPropsDlg.cpp:378
+#: Src/wptKeyPropsDlg.cpp:379
msgid "Ownertrust successfully changed."
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚ͳ‚µ‚•ÏX‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:226
-#: Src/wptKeyPropsDlg.cpp:391 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:392 Src/wptKeyRevokersDlg.cpp:160
msgid "Key Revokers"
msgstr "ƒL[‚𖳌ø‰»‚«‚Ì‚¤"
@@ -4816,12 +4868,12 @@
# c:\oss\winpt\src\wptImportList.cpp:220
# c:\oss\winpt\src\wptKeyManager.cpp:516
# c:\oss\winpt\src\wptKeyserverDlg.cpp:150
-#: Src/wptKeyserverDlg.cpp:160
+#: Src/wptKeyserverDlg.cpp:161
msgid "Imported Keys"
msgstr "ƒCƒ“ƒ|[ƒg‚µ‚½ƒL["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:116
-#: Src/wptKeyserverDlg.cpp:186
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -4832,36 +4884,37 @@
"”F‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:127
-#: Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "FINGERƒL[‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %s\n"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:141
-#: Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr "‚±‚ê‚Í—LŒø‚ÈOpenPGPƒL[‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:261
-#: Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:363
msgid "Please select one of the servers."
msgstr "ˆê‚‚̃T[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:266
-#: Src/wptKeyserverDlg.cpp:366
-msgid "Only HTTP keyserver can be used."
+#: Src/wptKeyserverDlg.cpp:369
+#, fuzzy
+msgid "Only HKP keyserver can be used."
msgstr "HTTPƒT[ƒo[ƒL[‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:289
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:386
msgid "DNS Name"
msgstr "DNS–¼"
-#: Src/wptKeyserverDlg.cpp:384
+#: Src/wptKeyserverDlg.cpp:387
msgid "Port"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:468
+#: Src/wptKeyserverDlg.cpp:471
msgid "No space for new keyserver entry"
msgstr "V‚µ‚¢ƒL[ƒT[ƒo[‚ÌŽQ‰Á‚É—]—T‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -4880,12 +4933,12 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:492
msgid "HKP Keyserver"
msgstr "HKPƒL[ƒT[ƒo["
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:493
msgid "LDAP Keyserver"
msgstr "LDAPƒL[ƒT[ƒo["
@@ -4904,7 +4957,7 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:491
+#: Src/wptKeyserverDlg.cpp:494
msgid "Finger Keyserver"
msgstr "ƒtƒBƒ“ƒK[ƒL[ƒT[ƒo["
@@ -4923,75 +4976,75 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:72
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
-#: Src/wptKeyserverDlg.cpp:753
+#: Src/wptKeyserverDlg.cpp:519 Src/wptKeyserverDlg.cpp:736
+#: Src/wptKeyserverDlg.cpp:756
msgid "Edit Keyserver"
msgstr "ƒL[ƒT[ƒo[•ÒW"
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:612
msgid "&Add"
msgstr "’ljÁ(&A)"
# c:\oss\winpt\src\wptImportList.cpp:135 c:\oss\winpt\src\wptKeylist.cpp:50
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:522
msgid "Type:"
msgstr "Ží—Þ"
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:523
msgid "Port:"
msgstr "ƒ|[ƒg"
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:524
msgid "Host name:"
msgstr "ƒzƒXƒg"
# c:\oss\winpt\src\wptKeygenDlg.cpp:200 c:\oss\winpt\src\wptKeygenDlg.cpp:377
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:532
msgid "Please enter a host name"
msgstr "ƒzƒXƒg–¼‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-#: Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:537
msgid "Invalid port, valid numbers are < 65535"
msgstr "–³Œø‚ȃ|[ƒgB—LŒø‚È’l‚Í <65535 ‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:581 Src/wptKeyserverSearchDlg.cpp:65
msgid "&Receive"
msgstr "ŽóM(&R)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:300
-#: Src/wptKeyserverDlg.cpp:580
+#: Src/wptKeyserverDlg.cpp:583
msgid "Send key (default is receiving)"
msgstr "ƒL[‚ð‘—M‚·‚é(‹K’è‚ÍŽóM‚·‚邱‚Æ‚Å‚·)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:302
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:585
#, fuzzy
msgid "Key ID or email address you want to search for"
msgstr "ŒŸõ‚·‚é‚à‚̂̃L[ID‚Ü‚½‚Í“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:586
msgid "&Search"
msgstr "ŒŸõ(&S)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:114
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:587
msgid "C&hange proxy"
msgstr "ƒvƒƒNƒV[•ÏX(&C)"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:291
-#: Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyserverDlg.cpp:588
msgid "Set &default"
msgstr "‹K’èÝ’è(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:576
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:613
msgid "&Remove"
msgstr "Žæ‚蜂(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:573
-#: Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyserverDlg.cpp:614
msgid "&Edit"
msgstr "•ÒW(&E)"
@@ -4999,7 +5052,7 @@
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:52
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:57
# c:\oss\winpt\src\wptProxySettingsDlg.cpp:61
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:648 Src/wptProxySettingsDlg.cpp:73
#: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
#: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
#: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -5009,28 +5062,28 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:381
# c:\oss\winpt\src\wptKeyserverDlg.cpp:407
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
+#: Src/wptKeyserverDlg.cpp:656 Src/wptKeyserverDlg.cpp:697
msgid "Please enter the search pattern."
msgstr "ŒŸõƒpƒ^[ƒ“‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:370
# c:\oss\winpt\src\wptKeyserverDlg.cpp:395
-#: Src/wptKeyserverDlg.cpp:678
+#: Src/wptKeyserverDlg.cpp:681
msgid "Please select one of the keyservers."
msgstr "ˆê‚‚̃L[ƒT[ƒo[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:411
-#: Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:702
msgid "Only keyids are allowed."
msgstr "ƒL[ID‚Ì‚Ý‚ªŽg—p‚©‚Ì‚¤‚Å‚·B"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:416
-#: Src/wptKeyserverDlg.cpp:705
+#: Src/wptKeyserverDlg.cpp:708
msgid "Only enter the name of the user."
msgstr "ƒ†[ƒU[‚Ì–¼‘O‚¾‚¯‚ð“ü—Í‚·‚é"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:420
-#: Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:714
msgid "Only email addresses or keyids are allowed."
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚Ü‚½‚̓L[ID‚Ì‚Ý‚ÍŽg—p‚©‚Ì‚¤‚Å‚·B"
@@ -5046,13 +5099,13 @@
msgstr "ƒL[ƒT[ƒo[‚ðŒŸõ‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:59
-#: Src/wptKeyserverSearchDlg.cpp:94 Src/wptKeyserverSearchDlg.cpp:99
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:95 Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Keyserver Search"
msgstr "ƒL[ƒT[ƒo[ŒŸõ"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:177
-#: Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:101
#, c-format
msgid ""
"The search result contains a lot of keys: %d\n"
@@ -5085,23 +5138,23 @@
msgstr "–¼"
# c:\oss\winpt\src\wptFileManager.cpp:1019
-#: Src/wptKeysigDlg.cpp:131
+#: Src/wptKeysigDlg.cpp:147
#, c-format
msgid "%s %s signature"
msgstr "%s %s –¼"
# c:\oss\winpt\src\wptKeysigDlg.cpp:189
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:163 Src/wptKeysigDlg.cpp:205
+#: Src/wptKeysigDlg.cpp:155 Src/wptKeysigDlg.cpp:180 Src/wptKeysigDlg.cpp:213
msgid "Exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚é‚à‚Ì"
# c:\oss\winpt\src\wptKeysigDlg.cpp:190
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:156 Src/wptKeysigDlg.cpp:214
msgid "Non-revocably"
msgstr "–³Œø‚Éo—ˆ‚È‚¢‚æ"
# c:\oss\winpt\src\wptSigList.cpp:43
-#: Src/wptKeysigDlg.cpp:143 Src/wptSigList.cpp:55
+#: Src/wptKeysigDlg.cpp:159 Src/wptSigList.cpp:55
msgid "Class"
msgstr "ƒNƒ‰ƒX"
@@ -5110,75 +5163,85 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:886
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:1141
# c:\oss\winpt\src\wptKeysigDlg.cpp:192
-#: Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:160
msgid "Expire date"
msgstr "—LŒøŠúŒÀ"
+# c:\oss\winpt\src\wptImportList.cpp:134
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:808
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:920 c:\oss\winpt\src\wptKeylist.cpp:55
+# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:44
+# c:\oss\winpt\src\wptSigList.cpp:44
+#: Src/wptKeysigDlg.cpp:161
+#, fuzzy
+msgid "Creation date"
+msgstr "ì¬"
+
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:162
msgid "Issuer key"
msgstr "”sŽÒƒL["
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:163
msgid "Issuer key ID"
msgstr "”sŽÒƒL[ID"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:135
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:164
msgid "Policy URL"
msgstr "ƒ|ƒŠƒV[URL"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:148 Src/wptKeysigDlg.cpp:209
+#: Src/wptKeysigDlg.cpp:165 Src/wptKeysigDlg.cpp:217
msgid "Signature Properties"
msgstr "–¼‚Ì‘®«"
# c:\oss\winpt\src\wptKeysigDlg.cpp:189
-#: Src/wptKeysigDlg.cpp:163
+#: Src/wptKeysigDlg.cpp:180
msgid "Non-exportable"
msgstr "ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢‚à‚Ì"
# c:\oss\winpt\src\wptSigList.cpp:118
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:153
+#: Src/wptKeysigDlg.cpp:193 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr "ƒ†[ƒU[ID‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysigDlg.cpp:396
-#: Src/wptKeysigDlg.cpp:308
+#: Src/wptKeysigDlg.cpp:316
msgid "Really receive all missing keys?"
msgstr "‚·‚ׂĂ̎¸‚Á‚½ƒL[‚ð–{“–‚ÉŽóM‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeysigDlg.cpp:342 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:350 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "–¼‚Ì‘®«(&P)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeysigDlg.cpp:343
+#: Src/wptKeysigDlg.cpp:351
msgid "Signing &Key Properties"
msgstr "ƒL[‚Ì‘®«‚𖼂·‚é(&K)"
# c:\oss\winpt\src\wptKeysigDlg.cpp:301
-#: Src/wptKeysigDlg.cpp:380
+#: Src/wptKeysigDlg.cpp:388
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñBƒL[ƒT[ƒo[‚æ‚èŽóM‚³‚ê‚Ü‚·‚©H"
-#: Src/wptKeysigDlg.cpp:391
+#: Src/wptKeysigDlg.cpp:399
msgid "Key not found in keyring."
msgstr "ƒL[‚ªƒL[ƒŠƒ“ƒO‚É‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysigDlg.cpp:330
-#: Src/wptKeysigDlg.cpp:416
+#: Src/wptKeysigDlg.cpp:424
#, c-format
msgid "Signature List for \"%s\""
msgstr "–¼ˆê——‚Ђ傤\"%s\"—p"
# c:\oss\winpt\src\wptKeysigDlg.cpp:333
-#: Src/wptKeysigDlg.cpp:418
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr "ƒL[‚ðŽóM‚·‚é(&R)"
@@ -5195,7 +5258,7 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:152
# c:\oss\winpt\src\wptKeysignDlg.cpp:266
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
msgid "Choose Signature Class"
msgstr "–¼ƒNƒ‰ƒX‚ð‘I‘ð‚·‚é"
@@ -5237,16 +5300,29 @@
msgstr "‚Í‚¸‚Í‚È‚¢"
# c:\oss\winpt\src\wptKeysignDlg.cpp:214
-#: Src/wptKeysignDlg.cpp:313
-#, c-format
+#: Src/wptKeysignDlg.cpp:304
+#, fuzzy, c-format
msgid ""
-"pub %d/%s created: %s expires: %s\n"
+"pub %d/0x%s created: %s expires: %s\n"
"\n"
"Primary key fingerprint: %s\n"
"\n"
+msgstr ""
+"ŒöŠJ %d/%s 쬓ú: %s —LŒøŠúŒÀ: %s\n"
+"\n"
+"ƒvƒ‰ƒCƒ}ƒŠƒtƒBƒ“ƒK[ƒvƒŠƒ“ƒg: %s\n"
+"\n"
"\t%s\n"
"\n"
"\n"
+"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
+
+# c:\oss\winpt\src\wptKeysignDlg.cpp:214
+#: Src/wptKeysignDlg.cpp:321
+#, fuzzy
+msgid ""
+"\n"
+"\n"
"Are you really sure that you want to sign this key with YOUR key?\n"
msgstr ""
"ŒöŠJ %d/%s 쬓ú: %s —LŒøŠúŒÀ: %s\n"
@@ -5259,47 +5335,47 @@
"‚±‚̃L[‚ðŽ©•ª‚̃L[‚Æ–{“–‚É–¼‚µ‚Ü‚·‚©H\n"
# c:\oss\winpt\src\wptKeysignDlg.cpp:226
-#: Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:351
msgid "No valid secret key found."
msgstr "—LŒø‚Ȕ閧Œ®‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeysignDlg.cpp:231
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:357
msgid "Sign local only (non exportable signature)"
msgstr "ƒ[ƒJƒ‹—pƒVƒOƒjƒ`ƒƒ[(ƒGƒLƒXƒ|[ƒg‚Å‚«‚È‚¢ƒVƒOƒjƒ`ƒƒ[)"
# c:\oss\winpt\src\wptKeysignDlg.cpp:232
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:358
msgid "Signature expires on"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚Í"
# c:\oss\winpt\src\wptKeysignDlg.cpp:233
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:359
msgid "Sign non-revocably"
msgstr "–³Œø‰»‚Å‚«‚È‚¢‚悤‚É–¼‚·‚é"
-#: Src/wptKeysignDlg.cpp:334
+#: Src/wptKeysignDlg.cpp:360
msgid "&Ask for certification level"
msgstr "–¼‚·‚郌ƒxƒ‹‚ð—v‹‚·‚é(&A)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeysignDlg.cpp:337
+#: Src/wptKeysignDlg.cpp:363
msgid "&Show photo"
msgstr "ƒtƒHƒg‚ðŒ©‚¹‚é(&S)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:155
-#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
+#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:97
+#: Src/wptPassphraseCB.cpp:103 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "“ü—Í‚ð‰B‚·(&H)"
-#: Src/wptKeysignDlg.cpp:399
+#: Src/wptKeysignDlg.cpp:425
msgid "You cannot select today as the expiration date."
msgstr "¡“ú‚Ì“ú•t‚ð—LŒøŠúŒÀ“ú‚Æ‚µ‚Ä‘I‘ð‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
-#: Src/wptKeysignDlg.cpp:433
+#: Src/wptKeysignDlg.cpp:460
msgid "This key is already signed by your key"
msgstr "ƒL[‚ª‚ ‚È‚½‚̃L[‚ÆŠù‚É–¼‚µ‚Ä‚¢‚Ü‚·B"
@@ -5308,75 +5384,75 @@
msgid "Trustlist"
msgstr "M—pˆê——‚Ђ傤"
-#: Src/wptMainProc.cpp:104
+#: Src/wptMainProc.cpp:103
msgid "Delete Clipboard Contents"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh“à—e‚ð휂·‚éB"
-#: Src/wptMainProc.cpp:106
+#: Src/wptMainProc.cpp:105
msgid "&Remember the answer"
msgstr "“š‚ðŠo‚¦‚Ä‚‚¾‚³‚¢(&R)"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptMainProc.cpp:108
+#: Src/wptMainProc.cpp:107
msgid "Do you want to delete the contents from the clipboard?"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì“à—e‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptMainProc.cpp:211
-#: Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:154
msgid "Could not access secret keyring."
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMainProc.cpp:265
# c:\oss\winpt\src\wptTextInputDlg.cpp:76
-#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:214 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "ƒeƒLƒXƒg“ü—Í"
# c:\oss\winpt\src\wptMainProc.cpp:284
-#: Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:242
msgid "Unknown OpenPGP type."
msgstr "–¢’m‚ÌOpenPGPƒ^ƒCƒv"
# c:\oss\winpt\src\wptMainProc.cpp:336
-#: Src/wptMainProc.cpp:370
+#: Src/wptMainProc.cpp:342
msgid "Could not set current window mode hooks."
msgstr ""
"Œ»Ý‚̃EƒBƒ“ƒhƒ‚[ƒh‚ɃtƒbƒNƒXuhooksv‚ðƒZƒbƒg‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptMainProc.cpp:399
-#: Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:394
msgid "About..."
msgstr "WinPT‚ɂ‚¢‚Ä..."
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:404
msgid "Decrypt/Verify"
msgstr "•œ†/Šm”F"
-#: Src/wptMainProc.cpp:443
+#: Src/wptMainProc.cpp:415
msgid "Current Window"
msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
# c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:473
msgid "Remove all passphrases from cache?"
msgstr "‚·‚ׂẴpƒXƒtƒŒ[ƒY‚ðƒLƒƒƒbƒVƒ…‚©‚çŠO‚¹‚Ü‚·B"
# c:\oss\winpt\src\wptClipImportDlg.cpp:112
# c:\oss\winpt\src\wptMainProc.cpp:466 c:\oss\winpt\src\wptProgressDlg.cpp:98
# c:\oss\winpt\src\wptRegistry.cpp:133
-#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:474 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
# c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:512
+#: Src/wptMainProc.cpp:484
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BWinPT‚ðI—¹‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptMainProc.cpp:510
-#: Src/wptMainProc.cpp:545
+#: Src/wptMainProc.cpp:517
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -5385,12 +5461,6 @@
"ƒEƒBƒ“ƒhƒE‚ɃeƒLƒXƒg‚ª“ü‚Á‚Ä‚ ‚邱‚Æ‚ðŠm”F‚µ‚Ä‚‚¾‚³‚¢B\n"
"%s."
-# c:\oss\winpt\src\wptMainProc.cpp:566
-# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
-msgid "WinPT Preferences"
-msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
-
# c:\oss\winpt\src\wptMAPI.cpp:96
#: Src/wptMAPI.cpp:133 Src/wptMAPI.cpp:208
#, fuzzy
@@ -5464,27 +5534,27 @@
msgstr "Š—LŽÒ‚ÌM—Š(ownertrust)‚̃Cƒ“ƒ|[ƒg‚ɬŒ÷‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:61
-#: Src/wptPassphraseCB.cpp:98
+#: Src/wptPassphraseCB.cpp:99
msgid "Encrypted with the following public key(s)"
msgstr "ˆÈ‰º‚ÌŒöŠJŒ®‚ňƉ»‚µ‚½‚à‚Ì‚Å‚·B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:82
-#: Src/wptPassphraseCB.cpp:142
+#: Src/wptPassphraseCB.cpp:143
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "–³–¼ƒL[ID (%s, 0x%s)"
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:155
msgid "Bad passphrase; Enter passphrase again"
msgstr "–³Œø‚ȃpƒXƒtƒŒ[ƒYAÄ“x“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptPassphraseCB.cpp:90
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:156
msgid "Please enter your passphrase"
msgstr "‚ ‚È‚½‚̃pƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptSymEnc.cpp:40 c:\oss\winpt\src\wptSymEnc.cpp:50
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:160
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -5495,11 +5565,11 @@
# c:\oss\winpt\src\wptPassphraseCB.cpp:224
#: Src/wptPassphraseCB.cpp:306
-#, c-format
+#, fuzzy, 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"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s (main key ID 0x%s)\n"
msgstr ""
"ˆÈ‰º‚æ‚̔閧Œ®‚ðƒAƒ“ƒƒbƒN‚·‚é‚̂ɃpƒXƒtƒŒ[ƒY‚ª•K—v‚Å‚·B\n"
"ƒ†[ƒU[: \"%s\"\n"
@@ -5507,11 +5577,11 @@
# c:\oss\winpt\src\wptPassphraseCB.cpp:231
#: Src/wptPassphraseCB.cpp:312
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-"%s key, ID %s\n"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s\n"
msgstr ""
"ˆÈ‰º‚æ‚̔閧Œ®‚ðƒAƒ“ƒƒbƒN‚·‚é‚̂ɃpƒXƒtƒŒ[ƒY‚ª•K—v‚Å‚·B\n"
"ƒ†[ƒU[: \"%s\"\n"
@@ -5897,11 +5967,11 @@
msgstr "PKA: Šm”F‚µ‚½–¼ŽÒ‚ÌZŠ‚Í '%s' ‚Å‚·B"
# c:\oss\winpt\src\wptClipVerifyDlg.cpp:122
-#: Src/wptVerifyList.cpp:130
+#: Src/wptVerifyList.cpp:136
msgid "The signature is expired!"
msgstr "–¼‚Ì—LŒøŠúŒÀ‚ª‰ß‚¬‚Ä‚¢‚Ü‚·I"
-#: Src/wptVerifyList.cpp:135
+#: Src/wptVerifyList.cpp:142
msgid ""
"WARNING: This key is not certified with a trusted signature!\r\n"
" There is no indication that the signature belongs to the "
@@ -5912,10 +5982,23 @@
"‚¹‚ñB\r\n"
# c:\oss\winpt\src\wptVerifyList.cpp:77 c:\oss\winpt\src\wptVerifyList.cpp:85
-#: Src/wptVerifyList.cpp:163
+#: Src/wptVerifyList.cpp:170
msgid "Signed"
msgstr "–¼‚µ‚Ü‚µ‚½"
+# c:\oss\winpt\src\wptClipDecryptDlg.cpp:130
+# c:\oss\winpt\src\wptFileManager.cpp:997
+#~ msgid ""
+#~ "Encrypted with %s key, ID %s.%s\n"
+#~ "Decryption failed: secret key not available."
+#~ msgstr ""
+#~ " %s‚ňƉ»‚µ‚½ AID‚ª %s.%s‚Å‚·\n"
+#~ "•œ†‚ÉŽ¸”s‚µ‚Ü‚µ‚½: ”é–§Œ®‚ª—˜—p‚Å‚«‚Ü‚¹‚ñB"
+
+# c:\oss\winpt\src\wptGPG.cpp:1029
+#~ msgid "No GPG error description available."
+#~ msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
+
# c:\oss\winpt\src\wptCardDlg.cpp:639
#~ msgid "Admin PIN must be minimal 8 characters."
#~ msgstr "ŠÇ—ŽÒ—pˆÃؔԆ‚Ì’·‚³‚ÍÅ’á‚W•¶Žš‚Å‚·B"
Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Po/pt_BR.po 2006-08-05 10:31:06 UTC (rev 256)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: WinPT 1.0.0\n"
"Report-Msgid-Bugs-To: winpt at freakmail.de\n"
-"POT-Creation-Date: 2006-07-29 12:51+0200\n"
+"POT-Creation-Date: 2006-08-05 12:29+0200\n"
"PO-Revision-Date: 2006-06-14 22:00-0300\n"
"Last-Translator: Eduardo S. Dobay <edudobay at gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar.conectiva.com.br>\n"
@@ -14,33 +14,39 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: Src/WinPT.cpp:188
+#: Src/WinPT.cpp:75
+msgid ""
+"The gpg.conf contains at least one argument which points to a non-existing "
+"file."
+msgstr ""
+
+#: Src/WinPT.cpp:195
msgid "Could not create GPG home directory"
msgstr "Não foi possível criar o diretório pessoal GPG"
-#: Src/WinPT.cpp:189 Src/WinPT.cpp:271 Src/WinPT.cpp:275 Src/WinPT.cpp:476
-#: Src/WinPT.cpp:485 Src/WinPT.cpp:492 Src/WinPT.cpp:532 Src/WinPT.cpp:560
-#: Src/WinPT.cpp:569 Src/WinPT.cpp:573 Src/WinPT.cpp:590 Src/WinPT.cpp:658
-#: Src/WinPT.cpp:671 Src/WinPT.cpp:718 Src/WinPT.cpp:748 Src/WinPT.cpp:766
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:912
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:934 Src/wptGPG.cpp:945
-#: Src/wptMainProc.cpp:371 Src/wptMainProc.cpp:544
+#: Src/WinPT.cpp:196 Src/WinPT.cpp:278 Src/WinPT.cpp:282 Src/WinPT.cpp:483
+#: Src/WinPT.cpp:492 Src/WinPT.cpp:499 Src/WinPT.cpp:539 Src/WinPT.cpp:567
+#: Src/WinPT.cpp:576 Src/WinPT.cpp:580 Src/WinPT.cpp:597 Src/WinPT.cpp:665
+#: Src/WinPT.cpp:678 Src/WinPT.cpp:725 Src/WinPT.cpp:760 Src/WinPT.cpp:779
+#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:926
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:948 Src/wptGPG.cpp:959
+#: Src/wptMainProc.cpp:343 Src/wptMainProc.cpp:516
msgid "WinPT Error"
msgstr "Erro WinPT"
-#: Src/WinPT.cpp:220
+#: Src/WinPT.cpp:227
msgid "No useable secret key found."
msgstr "Não foi encontrada nenhuma chave secreta utilizável."
-#: Src/WinPT.cpp:221 Src/wptKeyPropsDlg.cpp:356 Src/wptKeyPropsDlg.cpp:363
+#: Src/WinPT.cpp:228 Src/wptKeyPropsDlg.cpp:357 Src/wptKeyPropsDlg.cpp:364
msgid "WinPT Warning"
msgstr "Aviso do WinPT"
-#: Src/WinPT.cpp:270
+#: Src/WinPT.cpp:277
msgid "Could not read GnuPG version."
msgstr "Não foi possível ler a versão do GnuPG"
-#: Src/WinPT.cpp:276
+#: Src/WinPT.cpp:283
#, c-format
msgid ""
"Sorry, you need a newer GPG version.\n"
@@ -49,43 +55,43 @@
"Desculpe, você precisa de uma versão mais nova do GPG.\n"
"Versão GPG %d.%d.%d; versão requisitada do GPG "
-#: Src/WinPT.cpp:304
+#: Src/WinPT.cpp:311
msgid "Failed to create WinPT directory"
msgstr "Não foi possível criar o diretório do WinPT"
-#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:998 Src/wptKeyserver.cpp:634
+#: Src/WinPT.cpp:312 Src/WinPT.cpp:329 Src/WinPT.cpp:340
+#: Src/wptKeyManagerDlg.cpp:996 Src/wptKeyserver.cpp:634
#: Src/wptKeyserverDlg.cpp:70 Src/wptKeyserverDlg.cpp:72
-#: Src/wptKeyserverDlg.cpp:189 Src/wptKeyserverDlg.cpp:197
-#: Src/wptKeyserverDlg.cpp:213 Src/wptKeyserverDlg.cpp:361
-#: Src/wptKeyserverDlg.cpp:367 Src/wptKeyserverDlg.cpp:469
-#: Src/wptKeyserverDlg.cpp:529 Src/wptKeyserverDlg.cpp:534
-#: Src/wptKeyserverDlg.cpp:654 Src/wptKeyserverDlg.cpp:679
-#: Src/wptKeyserverDlg.cpp:695 Src/wptKeyserverDlg.cpp:700
-#: Src/wptKeyserverDlg.cpp:706 Src/wptKeyserverDlg.cpp:712
+#: Src/wptKeyserverDlg.cpp:190 Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:214 Src/wptKeyserverDlg.cpp:364
+#: Src/wptKeyserverDlg.cpp:370 Src/wptKeyserverDlg.cpp:472
+#: Src/wptKeyserverDlg.cpp:532 Src/wptKeyserverDlg.cpp:537
+#: Src/wptKeyserverDlg.cpp:657 Src/wptKeyserverDlg.cpp:682
+#: Src/wptKeyserverDlg.cpp:698 Src/wptKeyserverDlg.cpp:703
+#: Src/wptKeyserverDlg.cpp:709 Src/wptKeyserverDlg.cpp:715
msgid "Keyserver"
msgstr "Servidor de chaves"
-#: Src/WinPT.cpp:321
+#: Src/WinPT.cpp:328
msgid "Failed to copy the keyserver.conf"
msgstr "Não foi possível copiar keyserver.conf"
-#: Src/WinPT.cpp:477
+#: Src/WinPT.cpp:484
#, c-format
msgid ""
"The PTD.dll file has a different version than WinPT.exe\n"
"Please update the PTD.dll to version %d.%d.%d"
msgstr ""
-#: Src/WinPT.cpp:484
+#: Src/WinPT.cpp:491
msgid "Cryptographic selftest failed."
msgstr "Auto-teste criptográfico falhou."
-#: Src/WinPT.cpp:491
+#: Src/WinPT.cpp:498
msgid "A newer GPGME version is needed; at least "
msgstr "Uma versão mais nova do GPGME é necessária: pelo menos "
-#: Src/WinPT.cpp:533
+#: Src/WinPT.cpp:540
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -96,16 +102,16 @@
"Por favor verifique as configurações de registro do GPG:\n"
"%s."
-#: Src/WinPT.cpp:537
+#: Src/WinPT.cpp:544
msgid "Select GPG Public Keyring"
msgstr "Selecionar chaveiro público do GPG"
-#: Src/WinPT.cpp:559
+#: Src/WinPT.cpp:566
#, fuzzy
msgid "GPG home directory could not be determined."
msgstr "O diretório pessoal do GPG não pôde ser determinado."
-#: Src/WinPT.cpp:567
+#: Src/WinPT.cpp:574
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -113,7 +119,7 @@
"Não foi possível achar o executável do GPG (gpg.exe).\n"
"Você deseja verificar as preferências do GPG para corrigir este problema?"
-#: Src/WinPT.cpp:582
+#: Src/WinPT.cpp:589
#, fuzzy
msgid ""
"Could not access and/or find the public and secret keyring.\n"
@@ -126,20 +132,20 @@
"\n"
"Continue se você quiser que o WinPT ofereça mais opções.\n"
-#: Src/WinPT.cpp:615 Src/wptFileManagerDlg.cpp:525
-#: Src/wptFileManagerDlg.cpp:835
+#: Src/WinPT.cpp:622 Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:828
msgid "Wipe Free Space"
msgstr "Triturar espaço livre"
-#: Src/WinPT.cpp:657
+#: Src/WinPT.cpp:664
msgid "Could not register window class"
msgstr "Não foi possível registrar a classe de janela"
-#: Src/WinPT.cpp:671
+#: Src/WinPT.cpp:678
msgid "Could not create window"
msgstr "Não foi possível criar a janela"
-#: Src/WinPT.cpp:746
+#: Src/WinPT.cpp:758
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -147,7 +153,7 @@
"O cache de chaves não foi inicializado ou está vazio.\n"
"Por favor verifique sua configuração do GPG (chaveiros, diretórios...)"
-#: Src/WinPT.cpp:749
+#: Src/WinPT.cpp:761
#, fuzzy
msgid ""
"It seems that GPG is not configured properly.\n"
@@ -156,7 +162,7 @@
"Parece que o GPG não está configurado corretamente.\n"
"Você deseja iniciar a janela de preferências do GPG?"
-#: Src/WinPT.cpp:767
+#: Src/WinPT.cpp:780
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -179,7 +185,7 @@
msgstr "Sobre o GnuPG"
#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
-#: Src/wptMainProc.cpp:593
+#: Src/wptMainProc.cpp:565
msgid "About WinPT"
msgstr "Sobre o WinPT"
@@ -234,11 +240,11 @@
msgstr "&Sobre o GPG..."
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "&Help"
msgstr "A&juda"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:392
msgid "Card Manager"
msgstr "Gerenciador de cartões"
@@ -262,7 +268,7 @@
#: Src/wptCardDlg.cpp:696 Src/wptCardDlg.cpp:699 Src/wptCardDlg.cpp:724
#: Src/wptCardDlg.cpp:726 Src/wptCardDlg.cpp:731 Src/wptCardDlg.cpp:736
#: Src/wptCardDlg.cpp:800 Src/wptCardDlg.cpp:815 Src/wptCardDlg.cpp:818
-#: Src/wptMainProc.cpp:291
+#: Src/wptMainProc.cpp:263
msgid "Card Edit"
msgstr "Editar cartão"
@@ -323,11 +329,11 @@
msgid "&Name"
msgstr "&Nome"
-#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:377
+#: Src/wptCardDlg.cpp:581 Src/wptKeygenDlg.cpp:375
msgid "&Comment (optional)"
msgstr "&Comentário (opcional)"
-#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:379
+#: Src/wptCardDlg.cpp:582 Src/wptKeygenDlg.cpp:377
msgid "&Expire date"
msgstr "Data de &expiração"
@@ -335,11 +341,11 @@
msgid "Off-card passphrase"
msgstr "Frase secreta fora do cartão"
-#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:381
+#: Src/wptCardDlg.cpp:584 Src/wptKeyEditDlgs.cpp:640 Src/wptKeygenDlg.cpp:379
msgid "&Never"
msgstr "&Nunca"
-#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:378
+#: Src/wptCardDlg.cpp:585 Src/wptKeygenDlg.cpp:376
msgid "Email &address"
msgstr "Endereço de &e-mail"
@@ -351,7 +357,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Fazer backup da chave de cifragem fora do cartão"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1795
msgid "Card Key Generation"
msgstr "Geração da chave do cartão"
@@ -379,7 +385,7 @@
msgid "Please use plain ASCII charset for the fields."
msgstr "Por favor use caracteres ASCII puros para os campos."
-#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:457
#, fuzzy
msgid "The date you have chosen has already passed."
msgstr "A data escolhida está no passado."
@@ -442,33 +448,33 @@
"Por favor insira o smart card do OpenPGP\n"
"Pressione OK para continuar ou Cancelar"
-#: Src/wptClipDecryptDlg.cpp:59 Src/wptClipDecryptDlg.cpp:174
+#: Src/wptClipDecryptDlg.cpp:60 Src/wptClipDecryptDlg.cpp:177
#: Src/wptKeyRevokersDlg.cpp:129 Src/wptKeyRevokersDlg.cpp:173
-#: Src/wptVerifyList.cpp:250 Src/wptVerifyList.cpp:310
+#: Src/wptVerifyList.cpp:257 Src/wptVerifyList.cpp:317
msgid "user ID not found"
msgstr "ID de usuário não encontrada"
-#: Src/wptClipDecryptDlg.cpp:106
+#: Src/wptClipDecryptDlg.cpp:108
#, fuzzy
msgid "Signature status: created with a fully trusted key"
msgstr "Estado da assinatura: criada com uma chave totalmente confiável"
-#: Src/wptClipDecryptDlg.cpp:108
+#: Src/wptClipDecryptDlg.cpp:110
#, fuzzy
msgid "Signature status: created with a marginal trusted key"
msgstr "Estado da assinatura: criada com uma chave pouco confiável"
-#: Src/wptClipDecryptDlg.cpp:111
+#: Src/wptClipDecryptDlg.cpp:113
#, fuzzy
msgid "Signature status: created with an UNTRUSTED key"
msgstr "Estado da assinatura: criada com uma chave NÃO CONFIÁVEL"
-#: Src/wptClipDecryptDlg.cpp:114
+#: Src/wptClipDecryptDlg.cpp:116
#, fuzzy
msgid "Signature status: created with an undefined trusted key"
msgstr "Estado da assinatura: criada com uma chave de confiança indefinida"
-#: Src/wptClipDecryptDlg.cpp:124
+#: Src/wptClipDecryptDlg.cpp:126
#, c-format
msgid ""
"*** PGP SIGNATURE VERIFICATION ***\r\n"
@@ -480,17 +486,17 @@
"*** BEGIN PGP DECRYPTED TEXT ***\r\n"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:131
+#: Src/wptClipDecryptDlg.cpp:133
msgid ""
"\r\n"
"*** END PGP DECRYPTED TEXT ***"
msgstr ""
-#: Src/wptClipDecryptDlg.cpp:178
+#: Src/wptClipDecryptDlg.cpp:181
msgid "Decrypt Verify"
msgstr "Verificação de decifragem"
-#: Src/wptClipDecryptDlg.cpp:179
+#: Src/wptClipDecryptDlg.cpp:182
#, fuzzy, c-format
msgid ""
"%s\n"
@@ -504,45 +510,45 @@
"Assinatura faita: %s\n"
"De \"%s\" usando chave de ID 0x%s%s %s"
-#: Src/wptClipDecryptDlg.cpp:213 Src/wptClipVerifyDlg.cpp:157
-#: Src/wptClipVerifyDlg.cpp:165 Src/wptClipVerifyDlg.cpp:196
-#: Src/wptClipVerifyDlg.cpp:207 Src/wptClipVerifyDlg.cpp:225
-#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
-#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
+#: Src/wptClipDecryptDlg.cpp:216 Src/wptClipVerifyDlg.cpp:154
+#: Src/wptClipVerifyDlg.cpp:162 Src/wptClipVerifyDlg.cpp:191
+#: Src/wptClipVerifyDlg.cpp:202 Src/wptClipVerifyDlg.cpp:220
+#: Src/wptClipVerifyDlg.cpp:232 Src/wptFileManager.cpp:1636
+#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:584
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
-#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
+#: Src/wptMainProc.cpp:206 Src/wptMainProc.cpp:222 Src/wptMainProc.cpp:232
+#: Src/wptMainProc.cpp:401
msgid "Verify"
msgstr "Verificar"
-#: Src/wptClipDecryptDlg.cpp:220 Src/wptClipDecryptDlg.cpp:233
-#: Src/wptClipDecryptDlg.cpp:241 Src/wptClipDecryptDlg.cpp:248
-#: Src/wptClipDecryptDlg.cpp:250 Src/wptFileManager.cpp:1343
+#: Src/wptClipDecryptDlg.cpp:223 Src/wptClipDecryptDlg.cpp:236
+#: Src/wptClipDecryptDlg.cpp:244 Src/wptClipDecryptDlg.cpp:251
+#: Src/wptClipDecryptDlg.cpp:253 Src/wptFileManager.cpp:1343
#: Src/wptFileManager.cpp:1394
msgid "Decryption"
msgstr "Decifragem"
-#: Src/wptClipDecryptDlg.cpp:234 Src/wptFileManager.cpp:1395
-#, c-format
+#: Src/wptClipDecryptDlg.cpp:237 Src/wptFileManager.cpp:1395
+#, fuzzy, c-format
msgid ""
-"Encrypted with %s key, ID %s.%s\n"
+"Encrypted with %s key, ID 0x%s.%s\n"
"Decryption failed: secret key not available."
msgstr ""
"Cifrado com chave %s, ID %s.%s\n"
"Decifragem falhou: chave privada indisponível."
-#: Src/wptClipDecryptDlg.cpp:241
+#: Src/wptClipDecryptDlg.cpp:244
#, c-format
msgid "Unsupported algorithm: %s"
msgstr "Algoritmo não suportado: %s"
-#: Src/wptClipDecryptDlg.cpp:247
+#: Src/wptClipDecryptDlg.cpp:250
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
msgstr ""
"Mensagem OpenPGP quebrada (possivelmente: caracteres quoted-printable em "
"guarda)."
-#: Src/wptClipDecryptDlg.cpp:257
+#: Src/wptClipDecryptDlg.cpp:260
#, fuzzy
msgid ""
"WARNING: encrypted message has been manipulated!\n"
@@ -557,23 +563,23 @@
"É possível que os dados tenham sidos corrompidos durante o transporte\n"
"mas também é possível que isso seja parte de um ataque."
-#: Src/wptClipDecryptDlg.cpp:262
+#: Src/wptClipDecryptDlg.cpp:265
msgid "*** IMPORTANT ***"
msgstr "*** IMPORTANTE ***"
-#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
-#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
+#: Src/wptClipDecryptDlg.cpp:269 Src/wptClipEncryptDlg.cpp:216
+#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:265
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:992 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:994 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "Estado do GnuPG: Concluído"
#: Src/wptClipEditDlg.cpp:57 Src/wptClipEditDlg.cpp:123
#: Src/wptClipEditDlg.cpp:131 Src/wptClipEditDlg.cpp:171
#: Src/wptClipEditDlg.cpp:187 Src/wptClipEditDlg.cpp:257
-#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:225
-#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
-#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
+#: Src/wptClipEditDlg.cpp:262 Src/wptFileManagerDlg.cpp:220
+#: Src/wptMainProc.cpp:191 Src/wptMainProc.cpp:242 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:497 Src/wptMainProc.cpp:502
msgid "Clipboard"
msgstr "Área de transferência"
@@ -612,7 +618,7 @@
msgid "&Quote"
msgstr "Sai&r"
-#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:507
+#: Src/wptClipEditDlg.cpp:215 Src/wptFileManagerDlg.cpp:501
msgid "&Open..."
msgstr "&Abrir..."
@@ -620,19 +626,19 @@
msgid "&Save..."
msgstr "&Salvar..."
-#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:520
+#: Src/wptClipEditDlg.cpp:217 Src/wptFileManagerDlg.cpp:514
msgid "&Paste"
msgstr "Co&lar"
-#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:508
+#: Src/wptClipEditDlg.cpp:218 Src/wptFileManagerDlg.cpp:502
msgid "&Encrypt"
msgstr "&Cifrar"
-#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:510
+#: Src/wptClipEditDlg.cpp:219 Src/wptFileManagerDlg.cpp:504
msgid "&Decrypt"
msgstr "&Decifrar"
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:559
msgid "Clipboard Editor"
msgstr "Editor da área de transferência"
@@ -645,38 +651,37 @@
msgid "Recipients unsuable for encryption:\n"
msgstr "Destinatários inutilizáveis para cifragem:\n"
-#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:155
-#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipEncryptDlg.cpp:212
-#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
-#: Src/wptMainProc.cpp:216
+#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:206 Src/wptClipEncryptDlg.cpp:213
+#: Src/wptClipEncryptDlg.cpp:239 Src/wptMainProc.cpp:170
msgid "Encryption"
msgstr "Cifragem"
-#: Src/wptClipEncryptDlg.cpp:156
+#: Src/wptClipEncryptDlg.cpp:157
msgid "&Find"
msgstr "&Localizar"
-#: Src/wptClipEncryptDlg.cpp:157 Src/wptClipSignEncDlg.cpp:112
+#: Src/wptClipEncryptDlg.cpp:158 Src/wptClipSignEncDlg.cpp:112
#: Src/wptCommonDlg.cpp:76 Src/wptCommonDlg.cpp:253
-#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:231
-#: Src/wptFileManagerDlg.cpp:293 Src/wptFileSaveDlg.cpp:59
-#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:166
+#: Src/wptFileManagerDlg.cpp:97 Src/wptFileManagerDlg.cpp:226
+#: Src/wptFileManagerDlg.cpp:288 Src/wptFileSaveDlg.cpp:59
+#: Src/wptFirstRunDlg.cpp:47 Src/wptGPGPrefsDlg.cpp:168
#: Src/wptKeyEditDlgs.cpp:359 Src/wptKeyEditDlgs.cpp:440
#: Src/wptKeyEditDlgs.cpp:506 Src/wptKeyEditDlgs.cpp:641
-#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:549 Src/wptKeyRevokeDlg.cpp:79
-#: Src/wptKeyserverDlg.cpp:518 Src/wptKeyserverSearchDlg.cpp:66
-#: Src/wptKeysignDlg.cpp:336 Src/wptPassphraseCB.cpp:93
+#: Src/wptKeyEditOwnertrustDlg.cpp:67 Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:547 Src/wptKeyRevokeDlg.cpp:79
+#: Src/wptKeyserverDlg.cpp:521 Src/wptKeyserverSearchDlg.cpp:66
+#: Src/wptKeysignDlg.cpp:362 Src/wptPassphraseCB.cpp:94
#: Src/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
#: Src/wptPreferencesDlg.cpp:134 Src/wptTextInputDlg.cpp:86
msgid "&Cancel"
msgstr "&Cancelar"
-#: Src/wptClipEncryptDlg.cpp:204 Src/wptClipSignEncDlg.cpp:150
+#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipSignEncDlg.cpp:150
msgid "You must select at least one key."
msgstr "Você deve selecionar pelo menos uma chave."
-#: Src/wptClipEncryptDlg.cpp:241
+#: Src/wptClipEncryptDlg.cpp:240
#, c-format
msgid "No recipient found with '%s'"
msgstr "Nenhum destinatário encontrado com '%s'"
@@ -685,27 +690,27 @@
msgid "Key Import Statistics"
msgstr "Estatísticas de importação de chave"
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:226
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:224
#: Src/wptClipSignEncDlg.cpp:170
msgid "Could not get default key."
msgstr "Não foi possível obter a chave padrão."
-#: Src/wptClipSignDlg.cpp:103 Src/wptClipSignDlg.cpp:111
-#: Src/wptClipSignDlg.cpp:119 Src/wptClipSignDlg.cpp:153
-#: Src/wptClipSignDlg.cpp:159 Src/wptClipSignDlg.cpp:227
-#: Src/wptClipSignDlg.cpp:231 Src/wptClipSignDlg.cpp:251
-#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:101 Src/wptClipSignDlg.cpp:109
+#: Src/wptClipSignDlg.cpp:117 Src/wptClipSignDlg.cpp:151
+#: Src/wptClipSignDlg.cpp:157 Src/wptClipSignDlg.cpp:225
+#: Src/wptClipSignDlg.cpp:229 Src/wptClipSignDlg.cpp:249
+#: Src/wptClipSignDlg.cpp:260 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
+#: Src/wptMainProc.cpp:177
msgid "Signing"
msgstr "Assinar"
-#: Src/wptClipSignDlg.cpp:159
+#: Src/wptClipSignDlg.cpp:157
msgid "No useable signing key found"
msgstr "Nenhuma chave secreta utilizável foi encontrada"
-#: Src/wptClipSignDlg.cpp:232
+#: Src/wptClipSignDlg.cpp:230
#, c-format
msgid ""
"No key was chosen.\n"
@@ -716,7 +721,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
+#: Src/wptMainProc.cpp:184
msgid "Sign & Encrypt"
msgstr "Assinar e cifrar"
@@ -732,11 +737,11 @@
msgid "No key was selected."
msgstr "Nenhuma chave foi selecionada."
-#: Src/wptClipVerifyDlg.cpp:140
+#: Src/wptClipVerifyDlg.cpp:139
msgid "Signature Information"
msgstr "Informações da assinatura"
-#: Src/wptClipVerifyDlg.cpp:158
+#: Src/wptClipVerifyDlg.cpp:155
#, c-format
msgid ""
"Signature made %s using %s key ID 0x%s\n"
@@ -749,20 +754,20 @@
"\n"
"Você deseja tentar recuperar a chave do servidor?"
-#: Src/wptClipVerifyDlg.cpp:197 Src/wptFileVerifyDlg.cpp:51
-#: Src/wptGPGOptDlg.cpp:55
+#: Src/wptClipVerifyDlg.cpp:192 Src/wptFileVerifyDlg.cpp:51
+#: Src/wptGPGOptDlg.cpp:57
msgid "&Save"
msgstr "&Salvar"
-#: Src/wptClipVerifyDlg.cpp:225
+#: Src/wptClipVerifyDlg.cpp:220
msgid "Invalid signature state."
msgstr "Estado de assinatura inválido."
-#: Src/wptClipVerifyDlg.cpp:236
+#: Src/wptClipVerifyDlg.cpp:231
msgid "Could not extract key or signature information."
msgstr "Não foi possível extrair as informações da chave ou da assinatura."
-#: Src/wptClipVerifyDlg.cpp:272 Src/wptFileSaveDlg.cpp:58
+#: Src/wptClipVerifyDlg.cpp:267 Src/wptFileSaveDlg.cpp:58
#: Src/wptFileSaveDlg.cpp:81 Src/wptFileSaveDlg.cpp:86
#: Src/wptFileSaveDlg.cpp:92 Src/wptFileSaveDlg.cpp:98
#: Src/wptFileSaveDlg.cpp:100 Src/wptFileSaveDlg.cpp:108
@@ -809,8 +814,8 @@
#: Src/wptKeyEditDlgs.cpp:1998 Src/wptKeyEditDlgs.cpp:2065
#: Src/wptKeyEditDlgs.cpp:2128 Src/wptKeyEditDlgs.cpp:2142
#: Src/wptKeyEditDlgs.cpp:2157 Src/wptKeyEditDlgs.cpp:2197
-#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
-#: Src/wptKeyManagerDlg.cpp:1929
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:1934
msgid "Key Edit"
msgstr "Editar chave"
@@ -818,7 +823,7 @@
msgid "Enter preferred keyserver URL"
msgstr "Insira URL do servidor de chaves preferido"
-#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:339
+#: Src/wptCommonDlg.cpp:211 Src/wptGPGPrefsDlg.cpp:337
msgid "Choose Locale Directory"
msgstr "Escolha diretório de localizações"
@@ -1024,9 +1029,9 @@
#: Src/wptFileManager.cpp:880 Src/wptFileManager.cpp:995
#: Src/wptFileManager.cpp:1545 Src/wptFileManager.cpp:1572
#: Src/wptFileManager.cpp:1591 Src/wptFileManager.cpp:1841
-#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:535
-#: Src/wptFileManagerDlg.cpp:638 Src/wptFileStatDlg.cpp:149
-#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptFileManager.cpp:1903 Src/wptFileManagerDlg.cpp:529
+#: Src/wptFileManagerDlg.cpp:631 Src/wptFileStatDlg.cpp:154
+#: Src/wptMainProc.cpp:390 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "Gerenciador de arquivos"
@@ -1066,13 +1071,13 @@
"Você deseja desabilitá-la?"
#: Src/wptFileManager.cpp:407 Src/wptKeyEditDlgs.cpp:1075
-#: Src/wptVerifyList.cpp:162
+#: Src/wptVerifyList.cpp:169
msgid "Status"
msgstr "Status"
#: Src/wptFileManager.cpp:408 Src/wptKeyEditDlgs.cpp:1156
#: Src/wptKeyRevokersDlg.cpp:57 Src/wptMDSumDlg.cpp:190
-#: Src/wptVerifyList.cpp:161
+#: Src/wptVerifyList.cpp:168
msgid "Name"
msgstr "Nome"
@@ -1098,8 +1103,8 @@
msgid "\"%s\" does not exist"
msgstr "\"%s\" não existe"
-#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:273
-#: Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManager.cpp:1079 Src/wptFileStatDlg.cpp:283
+#: Src/wptFileStatDlg.cpp:287
msgid "File Status"
msgstr "Estado do arquivo"
@@ -1113,13 +1118,13 @@
msgstr "Não foi possível obter a chave secreta padrão."
#: Src/wptFileManager.cpp:1183 Src/wptFileManager.cpp:1495
-#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
+#: Src/wptFileManagerDlg.cpp:582 Src/wptMainProc.cpp:154
+#: Src/wptMainProc.cpp:398 Src/wptMainProc.cpp:405
msgid "Sign"
msgstr "Assinar"
-#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:587
-#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
+#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:580
+#: Src/wptMainProc.cpp:397 Src/wptMainProc.cpp:402
msgid "Encrypt"
msgstr "Cifrar"
@@ -1128,7 +1133,7 @@
msgstr "Cifragem simétrica"
#: Src/wptFileManager.cpp:1256 Src/wptFileManager.cpp:1261
-#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
+#: Src/wptMainProc.cpp:396 Src/wptMainProc.cpp:406
msgid "Symmetric"
msgstr "Simétrica"
@@ -1146,7 +1151,7 @@
msgstr "Insira nome de arquivo de texto puro"
#: Src/wptFileManager.cpp:1403 Src/wptFileManager.cpp:1423
-#: Src/wptFileManagerDlg.cpp:588
+#: Src/wptFileManagerDlg.cpp:581
msgid "Decrypt"
msgstr "Decifrar"
@@ -1196,11 +1201,11 @@
msgstr "Nome de arquivo inválido. Saindo"
#: Src/wptFileManager.cpp:1734 Src/wptFileManager.cpp:1745
-#: Src/wptFileManagerDlg.cpp:250 Src/wptImportList.cpp:404
+#: Src/wptFileManagerDlg.cpp:245 Src/wptImportList.cpp:404
#: Src/wptImportList.cpp:411 Src/wptImportList.cpp:421
#: Src/wptImportList.cpp:429 Src/wptImportList.cpp:438
#: Src/wptKeyManager.cpp:478 Src/wptKeyManager.cpp:489
-#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:221
+#: Src/wptKeyManager.cpp:617 Src/wptKeyserverDlg.cpp:222
msgid "Import"
msgstr "Importar"
@@ -1255,27 +1260,27 @@
msgid "Choose File Name for Output"
msgstr "Escolher nome de arquivo para saída"
-#: Src/wptFileManager.cpp:1977
+#: Src/wptFileManager.cpp:1978
msgid "Choose a Name for the Archive"
msgstr "Escolher nome para arquivo comprimido"
-#: Src/wptFileManager.cpp:1980
+#: Src/wptFileManager.cpp:1981
msgid "Invalid archive name. Exit."
msgstr "Nome de arquivo inválido. Saindo."
-#: Src/wptFileManager.cpp:1981 Src/wptFileManager.cpp:1989
+#: Src/wptFileManager.cpp:1982 Src/wptFileManager.cpp:1990
msgid "Encrypt Directory"
msgstr "Cifrar diretório"
-#: Src/wptFileManager.cpp:1988
+#: Src/wptFileManager.cpp:1989
msgid "Could not create zip archive."
msgstr "Não foi possível criar o arquivo zip."
-#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:159
+#: Src/wptFileManagerDlg.cpp:91 Src/wptFileManagerDlg.cpp:153
msgid "File Encrypt"
msgstr "Cifrar arquivo"
-#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:287
+#: Src/wptFileManagerDlg.cpp:92 Src/wptFileManagerDlg.cpp:282
msgid "&Text Output"
msgstr "Saída de &texto&"
@@ -1291,36 +1296,35 @@
msgid "&Select Key for signing"
msgstr "&Selecione chave para assinar"
-#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:292
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:287
msgid "Options"
msgstr "Opções"
-#: Src/wptFileManagerDlg.cpp:158
+#: Src/wptFileManagerDlg.cpp:152
msgid "Please select at least one recipient."
msgstr "Por favor selecione ao menos um destinatário."
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileStatDlg.cpp:279
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileStatDlg.cpp:283
#: Src/wptKeyManager.cpp:442
msgid "No valid OpenPGP data found."
msgstr "Nenhum dado OpenPGP válido encontrado."
-#: Src/wptFileManagerDlg.cpp:216 Src/wptFileManagerDlg.cpp:230
+#: Src/wptFileManagerDlg.cpp:210 Src/wptFileManagerDlg.cpp:225
#: Src/wptKeyManager.cpp:467
msgid "Key Import"
msgstr "Importat chave"
-#: Src/wptFileManagerDlg.cpp:221
+#: Src/wptFileManagerDlg.cpp:216
#, c-format
msgid "%s contain(s) %d key(s)."
msgstr "%s contém(êm) %d chave(s)."
-#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptFileManagerDlg.cpp:220 Src/wptFileManagerDlg.cpp:498
+#: Src/wptKeyManagerDlg.cpp:966 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Arquivo"
-#: Src/wptFileManagerDlg.cpp:247
+#: Src/wptFileManagerDlg.cpp:242
msgid ""
"Some of the imported keys are secret keys.\n"
"\n"
@@ -1332,159 +1336,159 @@
"O valor de confiança dessas chaves deve ser\n"
"configurado manualmente pelo diálogo de Propriedades da chave."
-#: Src/wptFileManagerDlg.cpp:286 Src/wptFileManagerDlg.cpp:338
+#: Src/wptFileManagerDlg.cpp:281 Src/wptFileManagerDlg.cpp:328
msgid "File Sign"
msgstr "Assinar arquivo"
-#: Src/wptFileManagerDlg.cpp:288
+#: Src/wptFileManagerDlg.cpp:283
msgid "&Normal Signature"
msgstr "Assinatura &normal"
-#: Src/wptFileManagerDlg.cpp:289
+#: Src/wptFileManagerDlg.cpp:284
msgid "&Detached Signature"
msgstr "Assinatura &destacada"
-#: Src/wptFileManagerDlg.cpp:290
+#: Src/wptFileManagerDlg.cpp:285
msgid "&Cleartext Signature"
msgstr "Assinatura de &texto"
-#: Src/wptFileManagerDlg.cpp:291
+#: Src/wptFileManagerDlg.cpp:286
msgid "Signature mode"
msgstr "Modo de assinatura"
-#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
+#: Src/wptFileManagerDlg.cpp:328 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
#: Src/wptKeyManager.cpp:722 Src/wptKeyManager.cpp:823
-#: Src/wptKeyManager.cpp:857 Src/wptKeyManagerDlg.cpp:1678
-#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
-#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1672
+#: Src/wptKeyManagerDlg.cpp:1688 Src/wptKeyManagerDlg.cpp:1716
+#: Src/wptKeyManagerDlg.cpp:1727 Src/wptKeyManagerDlg.cpp:1742
#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Please select a key."
msgstr "Por favor selecione uma chave."
-#: Src/wptFileManagerDlg.cpp:399
+#: Src/wptFileManagerDlg.cpp:387
msgid "0 Objects marked"
msgstr "0 Objetos marcados"
-#: Src/wptFileManagerDlg.cpp:403
+#: Src/wptFileManagerDlg.cpp:391
#, c-format
msgid "%d Object(s) marked"
msgstr "%d Objeto(s) marcado(s)"
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
+#: Src/wptFileManagerDlg.cpp:495 Src/wptMainProc.cpp:529
msgid "File Manager (use drag & drop to add files)"
msgstr "Gerenciados de arquivos (arrastar & soltar para adicionar arquivos)"
-#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
-#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
-#: Src/wptMainProc.cpp:421
+#: Src/wptFileManagerDlg.cpp:499 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptKeyManagerDlg.cpp:972 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptMainProc.cpp:393
msgid "Edit"
msgstr "Editar"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
+#: Src/wptFileManagerDlg.cpp:500 Src/wptKeyManagerDlg.cpp:968
msgid "View"
msgstr "Exibir"
-#: Src/wptFileManagerDlg.cpp:509 Src/wptFileManagerDlg.cpp:586
+#: Src/wptFileManagerDlg.cpp:503 Src/wptFileManagerDlg.cpp:579
msgid "Encrypt into ZIP"
msgstr "Cifrar para &ZIP"
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Sign"
msgstr "As&sinar"
-#: Src/wptFileManagerDlg.cpp:512 Src/wptFileManagerDlg.cpp:590
-#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
+#: Src/wptFileManagerDlg.cpp:506 Src/wptFileManagerDlg.cpp:583
+#: Src/wptMainProc.cpp:399 Src/wptMainProc.cpp:403
msgid "Sign && Encrypt"
msgstr "Assinar e cifrar"
-#: Src/wptFileManagerDlg.cpp:513
+#: Src/wptFileManagerDlg.cpp:507
msgid "&Verify"
msgstr "&Verificar"
-#: Src/wptFileManagerDlg.cpp:514
+#: Src/wptFileManagerDlg.cpp:508
msgid "S&ymmetric"
msgstr "Si&métrica"
-#: Src/wptFileManagerDlg.cpp:515
+#: Src/wptFileManagerDlg.cpp:509
msgid "&Import"
msgstr "&Importar"
-#: Src/wptFileManagerDlg.cpp:516
+#: Src/wptFileManagerDlg.cpp:510
msgid "E&xport"
msgstr "E&xportar"
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
+#: Src/wptFileManagerDlg.cpp:511 Src/wptMainProc.cpp:395
msgid "Exit"
msgstr "Sair"
-#: Src/wptFileManagerDlg.cpp:518
+#: Src/wptFileManagerDlg.cpp:512
msgid "&Reset"
msgstr "&Reiniciar"
-#: Src/wptFileManagerDlg.cpp:519
+#: Src/wptFileManagerDlg.cpp:513
msgid "Always on Top"
msgstr "Sempre visível"
-#: Src/wptFileManagerDlg.cpp:521
+#: Src/wptFileManagerDlg.cpp:515
msgid "&Select All"
msgstr "&Selecionar tudo"
-#: Src/wptFileManagerDlg.cpp:522
+#: Src/wptFileManagerDlg.cpp:516
msgid "&Preferences"
msgstr "&Preferências"
-#: Src/wptFileManagerDlg.cpp:523 Src/wptFileManagerDlg.cpp:593
+#: Src/wptFileManagerDlg.cpp:517 Src/wptFileManagerDlg.cpp:586
msgid "Send as Mail"
msgstr "Enviar por e-mail"
-#: Src/wptFileManagerDlg.cpp:524
+#: Src/wptFileManagerDlg.cpp:518
msgid "&List Packets"
msgstr "&Listar pacotes"
-#: Src/wptFileManagerDlg.cpp:526
+#: Src/wptFileManagerDlg.cpp:520
msgid "&Wipe"
msgstr "&Triturar"
-#: Src/wptFileManagerDlg.cpp:592
+#: Src/wptFileManagerDlg.cpp:585
msgid "Wipe"
msgstr "Triturar"
-#: Src/wptFileManagerDlg.cpp:594
+#: Src/wptFileManagerDlg.cpp:587
msgid "List Packets"
msgstr "Listar pacotes"
-#: Src/wptFileManagerDlg.cpp:626
+#: Src/wptFileManagerDlg.cpp:619
msgid "&Calc Digest"
msgstr "&Calcular hash"
-#: Src/wptFileManagerDlg.cpp:637
+#: Src/wptFileManagerDlg.cpp:630
msgid "This command requires admin privileges.\n"
msgstr "Esse comando requer privilégios de administrador.\n"
-#: Src/wptFileManagerDlg.cpp:787
+#: Src/wptFileManagerDlg.cpp:780
msgid "Are you sure you want to secure delete these files?"
msgstr "Tem certeza de que deseja triturar esses arquivos?"
-#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
+#: Src/wptFileManagerDlg.cpp:781 Src/wptMainProc.cpp:108
msgid "&Yes"
msgstr "&Sim"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
+#: Src/wptFileManagerDlg.cpp:782 Src/wptMainProc.cpp:109
msgid "&No"
msgstr "&Não"
-#: Src/wptFileManagerDlg.cpp:832
+#: Src/wptFileManagerDlg.cpp:825
msgid "Operation Status: Error"
msgstr "Estado da operação: erro"
-#: Src/wptFileManagerDlg.cpp:833
+#: Src/wptFileManagerDlg.cpp:826
msgid "Operation Status: Done."
msgstr "Estado da operação: concluída."
-#: Src/wptFileManagerDlg.cpp:876
+#: Src/wptFileManagerDlg.cpp:869
#, c-format
msgid ""
"Total Capacity: %12sk\n"
@@ -1541,7 +1545,7 @@
msgid "WinPT First Start"
msgstr "Primeira execução do WinPT"
-#: Src/wptGPG.cpp:830
+#: Src/wptGPG.cpp:844
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1551,19 +1555,19 @@
"somente-leitura. Nesse estado você não tem acesso de\n"
"escrita. Você deseja remover o atributo?"
-#: Src/wptGPG.cpp:833
+#: Src/wptGPG.cpp:847
msgid "GPG Information"
msgstr "Informação do GPG"
-#: Src/wptGPG.cpp:837
+#: Src/wptGPG.cpp:851
msgid "Could not reset read-only state."
msgstr "Não foi possível remover o estado somente-leitura."
-#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
+#: Src/wptGPG.cpp:852
msgid "GPG Error"
msgstr "Erro do GPG"
-#: Src/wptGPG.cpp:850
+#: Src/wptGPG.cpp:864
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1577,23 +1581,22 @@
"Os chaveiros estão num estado somente-leitura que é provavelmente\n"
"causado por outro programa que já abriu os arquivos.\n"
-#: Src/wptGPG.cpp:855
+#: Src/wptGPG.cpp:869
msgid "GPG Warning"
msgstr "Aviso do GPG"
-#: Src/wptGPG.cpp:879 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
-#: Src/wptGPGPrefsDlg.cpp:232 Src/wptGPGPrefsDlg.cpp:238
-#: Src/wptGPGPrefsDlg.cpp:243 Src/wptGPGPrefsDlg.cpp:248
-#: Src/wptGPGPrefsDlg.cpp:254 Src/wptGPGPrefsDlg.cpp:268
-#: Src/wptKeyEditDlgs.cpp:1713 Src/wptKeyManagerDlg.cpp:997
-#: Src/wptMainProc.cpp:444 Src/wptPreferencesDlg.cpp:225
-#: Src/wptPreferencesDlg.cpp:270 Src/wptPreferencesDlg.cpp:282
-#: Src/wptPreferencesDlg.cpp:295 Src/wptPreferencesDlg.cpp:326
-#: Src/wptRegistry.cpp:596
+#: Src/wptGPG.cpp:893 Src/wptGPGPrefsDlg.cpp:222 Src/wptGPGPrefsDlg.cpp:228
+#: Src/wptGPGPrefsDlg.cpp:234 Src/wptGPGPrefsDlg.cpp:240
+#: Src/wptGPGPrefsDlg.cpp:245 Src/wptGPGPrefsDlg.cpp:250
+#: Src/wptGPGPrefsDlg.cpp:256 Src/wptGPGPrefsDlg.cpp:270
+#: Src/wptKeyEditDlgs.cpp:1713 Src/wptMainProc.cpp:416
+#: Src/wptPreferencesDlg.cpp:225 Src/wptPreferencesDlg.cpp:270
+#: Src/wptPreferencesDlg.cpp:282 Src/wptPreferencesDlg.cpp:295
+#: Src/wptPreferencesDlg.cpp:326 Src/wptRegistry.cpp:596
msgid "Preferences"
msgstr "Preferências"
-#: Src/wptGPG.cpp:880
+#: Src/wptGPG.cpp:894
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1602,40 +1605,40 @@
"%s não existe.\n"
"Você deseja criar esse diretório?"
-#: Src/wptGPG.cpp:908
+#: Src/wptGPG.cpp:922
msgid "Please choose your Public Keyring"
msgstr "Por favor escolha seu chaveiro público"
-#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
+#: Src/wptGPG.cpp:925 Src/wptGPG.cpp:947
msgid "No keyring was chosen. Exit."
msgstr "Nenhum chaveiro foi escolhido. Saindo."
-#: Src/wptGPG.cpp:918
+#: Src/wptGPG.cpp:932
msgid "Overwrite old public keyring?"
msgstr "Sobrescrever antigo chaveiro público?"
-#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
+#: Src/wptGPG.cpp:938 Src/wptGPG.cpp:959
msgid "Could not copy file."
msgstr "Não foi possível copiar o arquivo."
-#: Src/wptGPG.cpp:930
+#: Src/wptGPG.cpp:944
msgid "Please choose your Secret Keyring"
msgstr "Por favor escolha seu chaveiro privado"
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:953
msgid "Overwrite old secret keyring?"
msgstr "Sobrescrever antigo chaveiro privado?"
-#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:999 Src/wptGPG.cpp:1088 Src/wptGPG.cpp:1101
msgid "Backup"
msgstr "Backup"
-#: Src/wptGPG.cpp:989
+#: Src/wptGPG.cpp:999
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Backup do chaveiro \"%s\" falhou"
-#: Src/wptGPG.cpp:1079
+#: Src/wptGPG.cpp:1089
#, fuzzy, c-format
msgid ""
"The backup drive '%s' does not seems to be accessable.\n"
@@ -1644,15 +1647,11 @@
"O drive de backup '%s' não parece estar acessível.\n"
"Por favor insira/verifique o drive para continuar."
-#: Src/wptGPG.cpp:1091
+#: Src/wptGPG.cpp:1101
#, c-format
msgid "Invalid backup mode %d"
msgstr "Modo de backup %d inválido"
-#: Src/wptGPG.cpp:1118
-msgid "No GPG error description available."
-msgstr "Descrição indisponível para o erro do GPG."
-
#: Src/wptGPGME.cpp:278
#, fuzzy
msgid "Error during verification process"
@@ -1689,46 +1688,46 @@
msgid "Good Signature (Revoked Key)"
msgstr "Assinatura boa (chave revogada)"
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:50 Src/wptGPGOptDlg.cpp:100
msgid "Could not load GnuPG config file!"
msgstr "Não foi possível carregar o arquivo de configuração do GnuPG!"
-#: Src/wptGPGOptDlg.cpp:49 Src/wptGPGOptDlg.cpp:70 Src/wptGPGOptDlg.cpp:76
-#: Src/wptGPGOptDlg.cpp:81 Src/wptGPGOptDlg.cpp:85 Src/wptGPGOptDlg.cpp:92
-#: Src/wptGPGOptDlg.cpp:98
+#: Src/wptGPGOptDlg.cpp:51 Src/wptGPGOptDlg.cpp:72 Src/wptGPGOptDlg.cpp:78
+#: Src/wptGPGOptDlg.cpp:83 Src/wptGPGOptDlg.cpp:87 Src/wptGPGOptDlg.cpp:94
+#: Src/wptGPGOptDlg.cpp:100
msgid "GPG Config"
msgstr "Configuração do GPG"
-#: Src/wptGPGOptDlg.cpp:54
+#: Src/wptGPGOptDlg.cpp:56
msgid "GnuPG Configuration File"
msgstr "Arquivo de configuração do GnuPG"
-#: Src/wptGPGOptDlg.cpp:56 Src/wptTextInputDlg.cpp:87
+#: Src/wptGPGOptDlg.cpp:58 Src/wptTextInputDlg.cpp:87
msgid "&Load"
msgstr "Ca&rregar"
-#: Src/wptGPGOptDlg.cpp:57
+#: Src/wptGPGOptDlg.cpp:59
#, fuzzy
msgid "&Exit"
msgstr "Sair"
-#: Src/wptGPGOptDlg.cpp:70
+#: Src/wptGPGOptDlg.cpp:72
msgid "The 'gpg.conf' file is not loaded."
msgstr "O arquivo 'gpg.conf' não foi carregado."
-#: Src/wptGPGOptDlg.cpp:76
+#: Src/wptGPGOptDlg.cpp:78
msgid "File contains invalid GnuPG keywords!"
msgstr "Arquivo contém palavras-chave GnuPG inválidas!"
-#: Src/wptGPGOptDlg.cpp:81
+#: Src/wptGPGOptDlg.cpp:83
msgid "Could not save GnuPG config file."
msgstr "Não foi possível salvar o arquivo de configuração do GnuPG."
-#: Src/wptGPGOptDlg.cpp:85
+#: Src/wptGPGOptDlg.cpp:87
msgid "Successfully saved."
msgstr "Salvo com sucesso."
-#: Src/wptGPGOptDlg.cpp:91
+#: Src/wptGPGOptDlg.cpp:93
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -1736,83 +1735,83 @@
"Dados atuais serão perdidos!\n"
"Tem certeza?"
-#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
-#: Src/wptMainProc.cpp:605
+#: Src/wptGPGPrefsDlg.cpp:152 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:577
msgid "GnuPG Preferences"
msgstr "Preferências do GnuPG"
-#: Src/wptGPGPrefsDlg.cpp:152
+#: Src/wptGPGPrefsDlg.cpp:154
msgid "GnuPG home directory (where both keyrings are located)"
msgstr "Diretório pessoal do GnuPG (onde ambos os chaveiros estão localizados)"
-#: Src/wptGPGPrefsDlg.cpp:154
+#: Src/wptGPGPrefsDlg.cpp:156
msgid "GnuPG exe file location (full path with added gpg.exe)"
msgstr ""
"Localização do arquivo executável do GnuPG (caminho completo + gpg.exe)"
-#: Src/wptGPGPrefsDlg.cpp:156
+#: Src/wptGPGPrefsDlg.cpp:158
msgid "Locale directory (to access the translation files)"
msgstr "Diretório de localização (para acessar arquivos de tradução)"
-#: Src/wptGPGPrefsDlg.cpp:157
+#: Src/wptGPGPrefsDlg.cpp:159
msgid "Ask for the signature class during key sign"
msgstr "Perguntar classe da assinatura ao assinar chave"
-#: Src/wptGPGPrefsDlg.cpp:158
+#: Src/wptGPGPrefsDlg.cpp:160
msgid "Allow to set an expiration date for signatures"
msgstr "Permitir data de expiração para assinaturas"
-#: Src/wptGPGPrefsDlg.cpp:159
+#: Src/wptGPGPrefsDlg.cpp:161
msgid "Comment in armored files"
msgstr "Comentário em arquivos protegidos"
-#: Src/wptGPGPrefsDlg.cpp:160
+#: Src/wptGPGPrefsDlg.cpp:162
msgid "Encrypt to this key"
msgstr "Cifrar para esta chave"
-#: Src/wptGPGPrefsDlg.cpp:161
+#: Src/wptGPGPrefsDlg.cpp:163
msgid "General GPG options"
msgstr "Opções gerais do GPG"
-#: Src/wptGPGPrefsDlg.cpp:162 Src/wptGPGPrefsDlg.cpp:163
-#: Src/wptGPGPrefsDlg.cpp:164 Src/wptPreferencesDlg.cpp:130
+#: Src/wptGPGPrefsDlg.cpp:164 Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:166 Src/wptPreferencesDlg.cpp:130
#: Src/wptPreferencesDlg.cpp:131
msgid "Browse..."
msgstr "Localizar..."
-#: Src/wptGPGPrefsDlg.cpp:165
+#: Src/wptGPGPrefsDlg.cpp:167
msgid "&Overwrite default settings"
msgstr "&Sobrescrever opções padrão"
-#: Src/wptGPGPrefsDlg.cpp:219
+#: Src/wptGPGPrefsDlg.cpp:221
msgid "Please enter the GnuPG home directory."
msgstr "Por favor insira o diretório pessoal do GnuPG."
-#: Src/wptGPGPrefsDlg.cpp:231
+#: Src/wptGPGPrefsDlg.cpp:233
msgid "Could not save 'HomeDir' in the registry."
msgstr "Não foi possível salvar 'HomeDir' no registro."
-#: Src/wptGPGPrefsDlg.cpp:237
+#: Src/wptGPGPrefsDlg.cpp:239
msgid "Please enter where GPG.exe is located."
msgstr "Por favor insira a localização de GPG.exe."
-#: Src/wptGPGPrefsDlg.cpp:242
+#: Src/wptGPGPrefsDlg.cpp:244
msgid "Could not find the GPG program in this directory."
msgstr "Não foi possível localizar o programa GPG nesse diretório."
-#: Src/wptGPGPrefsDlg.cpp:247
+#: Src/wptGPGPrefsDlg.cpp:249
msgid "Could not save 'gpgProgram' in the registry"
msgstr "Não foi possível salvar 'gpgProgram' no registro"
-#: Src/wptGPGPrefsDlg.cpp:267
+#: Src/wptGPGPrefsDlg.cpp:269
msgid "Could not get GPG config file"
msgstr "Não foi possível obter o arquivo de configuração do GPG"
-#: Src/wptGPGPrefsDlg.cpp:317
+#: Src/wptGPGPrefsDlg.cpp:319
msgid "Choose GPG Home Directory"
msgstr "Escolher diretório pessoal do GPG"
-#: Src/wptGPGPrefsDlg.cpp:345
+#: Src/wptGPGPrefsDlg.cpp:343
msgid "Choose GPG Binary"
msgstr "Escolhar executável GPG"
@@ -1831,23 +1830,23 @@
#: Src/wptKeyManager.cpp:750 Src/wptKeyManager.cpp:759
#: Src/wptKeyManager.cpp:770 Src/wptKeyManager.cpp:796
#: Src/wptKeyManager.cpp:823 Src/wptKeyManager.cpp:828
-#: Src/wptKeyManager.cpp:852 Src/wptKeyManager.cpp:857
-#: Src/wptKeyManager.cpp:871 Src/wptKeyManager.cpp:928
-#: Src/wptKeyManager.cpp:933 Src/wptKeyManager.cpp:990
-#: Src/wptKeyManager.cpp:1023 Src/wptKeyManager.cpp:1107
-#: Src/wptKeyManagerDlg.cpp:1326 Src/wptKeyManagerDlg.cpp:1337
-#: Src/wptKeyManagerDlg.cpp:1347 Src/wptKeyManagerDlg.cpp:1656
-#: Src/wptKeyManagerDlg.cpp:1679 Src/wptKeyManagerDlg.cpp:1694
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyManagerDlg.cpp:1712
-#: Src/wptKeyManagerDlg.cpp:1722 Src/wptKeyManagerDlg.cpp:1733
-#: Src/wptKeyManagerDlg.cpp:1748 Src/wptKeyManagerDlg.cpp:1765
-#: Src/wptKeyManagerDlg.cpp:1797 Src/wptKeyManagerDlg.cpp:1856
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:930
+#: Src/wptKeyManager.cpp:935 Src/wptKeyManager.cpp:992
+#: Src/wptKeyManager.cpp:1025 Src/wptKeyManager.cpp:1109
+#: Src/wptKeyManagerDlg.cpp:1324 Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1345 Src/wptKeyManagerDlg.cpp:1650
+#: Src/wptKeyManagerDlg.cpp:1673 Src/wptKeyManagerDlg.cpp:1688
+#: Src/wptKeyManagerDlg.cpp:1698 Src/wptKeyManagerDlg.cpp:1706
+#: Src/wptKeyManagerDlg.cpp:1716 Src/wptKeyManagerDlg.cpp:1727
+#: Src/wptKeyManagerDlg.cpp:1742 Src/wptKeyManagerDlg.cpp:1759
+#: Src/wptKeyManagerDlg.cpp:1791 Src/wptKeyManagerDlg.cpp:1856
#: Src/wptKeyManagerDlg.cpp:1874 Src/wptKeyManagerDlg.cpp:1879
-#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1955
-#: Src/wptKeyManagerDlg.cpp:1960 Src/wptKeyManagerDlg.cpp:2074
-#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:309
-#: Src/wptKeysigDlg.cpp:381 Src/wptKeysigDlg.cpp:391 Src/wptKeysigDlg.cpp:434
-#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
+#: Src/wptKeyManagerDlg.cpp:1884 Src/wptKeyManagerDlg.cpp:1960
+#: Src/wptKeyManagerDlg.cpp:1965 Src/wptKeyManagerDlg.cpp:2079
+#: Src/wptKeysigDlg.cpp:94 Src/wptKeysigDlg.cpp:106 Src/wptKeysigDlg.cpp:317
+#: Src/wptKeysigDlg.cpp:389 Src/wptKeysigDlg.cpp:399 Src/wptKeysigDlg.cpp:442
+#: Src/wptMainProc.cpp:391 Src/wptMainProc.cpp:540 Src/wptMainProc.cpp:548
msgid "Key Manager"
msgstr "Gerenciador de chaves"
@@ -1928,15 +1927,15 @@
#: Src/wptKeyEditDlgs.cpp:1483 Src/wptKeyEditDlgs.cpp:1514
#: Src/wptKeyEditDlgs.cpp:1592 Src/wptKeyEditDlgs.cpp:1758
#: Src/wptKeyEditDlgs.cpp:1960 Src/wptKeylist.cpp:424 Src/wptKeylist.cpp:458
-#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:142
-#: Src/wptKeysigDlg.cpp:207
+#: Src/wptKeyPropsDlg.cpp:152 Src/wptKeysigDlg.cpp:158
+#: Src/wptKeysigDlg.cpp:215
msgid "Revoked"
msgstr "Revogada"
#: Src/wptImportList.cpp:268 Src/wptKeyEditDlgs.cpp:259
#: Src/wptKeyEditDlgs.cpp:1127 Src/wptKeyEditDlgs.cpp:1346
#: Src/wptKeylist.cpp:426 Src/wptKeylist.cpp:456 Src/wptKeyPropsDlg.cpp:150
-#: Src/wptKeysigDlg.cpp:141 Src/wptKeysigDlg.cpp:208
+#: Src/wptKeysigDlg.cpp:157 Src/wptKeysigDlg.cpp:216
msgid "Expired"
msgstr "Expirada"
@@ -1953,34 +1952,34 @@
msgstr "ID de usuário inválida"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
+#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:980
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
-#: Src/wptVerifyList.cpp:166
+#: Src/wptVerifyList.cpp:173
msgid "User ID"
msgstr "ID de usuário"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "Tamanho"
#: Src/wptImportList.cpp:347 Src/wptKeyEditDlgs.cpp:1072
-#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
-#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:911
+#: Src/wptKeyManagerDlg.cpp:1004 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
-#: Src/wptVerifyList.cpp:165
+#: Src/wptVerifyList.cpp:172
msgid "Key ID"
msgstr "ID da chave"
#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1073
#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
+#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1007
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Criação"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
+#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1006
msgid "Type"
msgstr "Tipo"
@@ -1993,7 +1992,7 @@
"É possível que a proteção ASCII esteja danificada\n"
"e portanto um erro CRC ocorreu."
-#: Src/wptKeyCache.cpp:813
+#: Src/wptKeyCache.cpp:818
msgid "Load GPG Keyrings..."
msgstr "Carregar chaveiros GPG..."
@@ -2055,7 +2054,7 @@
"A imagem deve ser um arquivo JPEG."
#: Src/wptKeyEditDlgs.cpp:358 Src/wptKeyEditDlgs.cpp:439
-#: Src/wptKeysignDlg.cpp:335
+#: Src/wptKeysignDlg.cpp:361
msgid "Passphrase"
msgstr "Frase secreta"
@@ -2098,8 +2097,8 @@
#: Src/wptKeyEditDlgs.cpp:551 Src/wptKeyEditDlgs.cpp:722
#: Src/wptKeyEditDlgs.cpp:1446 Src/wptKeyEditDlgs.cpp:1516
#: Src/wptKeyEditDlgs.cpp:1566 Src/wptKeyEditDlgs.cpp:1614
-#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
-#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:499
+#: Src/wptKeygenDlg.cpp:600 Src/wptKeyPropsDlg.cpp:380
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "Estado do GnuPG"
@@ -2205,7 +2204,7 @@
#: Src/wptKeyEditDlgs.cpp:898 Src/wptKeyEditDlgs.cpp:930
#: Src/wptKeyEditDlgs.cpp:1011 Src/wptKeyEditDlgs.cpp:1334
#: Src/wptKeyEditDlgs.cpp:1407 Src/wptKeyEditDlgs.cpp:1467
-#: Src/wptKeyManagerDlg.cpp:1711
+#: Src/wptKeyManagerDlg.cpp:1705
msgid "There is no secret key available!"
msgstr "Não há chave secreta disponível!"
@@ -2218,7 +2217,7 @@
msgstr "Servidor de chaves preferido selecionado com sucesso."
#: Src/wptKeyEditDlgs.cpp:965 Src/wptKeyEditOwnertrustDlg.cpp:55
-#: Src/wptKeyPropsDlg.cpp:370
+#: Src/wptKeyPropsDlg.cpp:371
msgid "Change Ownertrust"
msgstr "Alterar confiança no proprietário"
@@ -2257,7 +2256,7 @@
msgid "Passphrase successfully changed."
msgstr "Frase secreta alterada com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
msgid "Description"
msgstr "Descrição"
@@ -2266,7 +2265,7 @@
msgstr "Expira"
#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyManagerDlg.cpp:915
msgid "Validity"
msgstr "Validade"
@@ -2502,7 +2501,7 @@
msgid "Do you really want to make this sig exportable?"
msgstr "Você realmente deseja tornar esta assinatura exportável?"
-#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyEditDlgs.cpp:1994 Src/wptKeysignDlg.cpp:466
msgid "Key successfully signed."
msgstr "Chave assinada com sucesso."
@@ -2531,7 +2530,7 @@
msgid "Command>"
msgstr "Comando>"
-#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:586
+#: Src/wptKeyEditDlgs.cpp:2151 Src/wptKeyserverDlg.cpp:589
#: Src/wptMDSumDlg.cpp:208 Src/wptOwnertrustDlg.cpp:103
msgid "&Close"
msgstr "&Fechar"
@@ -2584,8 +2583,8 @@
msgstr "Por favor escolha uma entrada."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
-#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:1926 Src/wptKeyPropsDlg.cpp:286
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2603,17 +2602,17 @@
msgid "Key Generation - Progress Dialog"
msgstr "Geração de chave - Progresso"
-#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
-#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:416 Src/wptKeygenDlg.cpp:421
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:431 Src/wptKeygenDlg.cpp:438
-#: Src/wptKeygenDlg.cpp:446 Src/wptKeygenDlg.cpp:460 Src/wptKeygenDlg.cpp:467
-#: Src/wptKeygenDlg.cpp:477 Src/wptKeygenDlg.cpp:498 Src/wptKeygenDlg.cpp:581
-#: Src/wptKeyManagerDlg.cpp:1788 Src/wptPassphraseDlg.cpp:147
+#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:296 Src/wptKeygenDlg.cpp:305
+#: Src/wptKeygenDlg.cpp:369 Src/wptKeygenDlg.cpp:414 Src/wptKeygenDlg.cpp:419
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:429 Src/wptKeygenDlg.cpp:436
+#: Src/wptKeygenDlg.cpp:444 Src/wptKeygenDlg.cpp:458 Src/wptKeygenDlg.cpp:465
+#: Src/wptKeygenDlg.cpp:475 Src/wptKeygenDlg.cpp:496 Src/wptKeygenDlg.cpp:579
+#: Src/wptKeyManagerDlg.cpp:1782 Src/wptPassphraseDlg.cpp:147
#: Src/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Geração de chave"
-#: Src/wptKeygenDlg.cpp:286
+#: Src/wptKeygenDlg.cpp:284
msgid ""
"It is STRONGLY recommend that you backup your keyrings because they both "
"contain VERY important data.\n"
@@ -2631,48 +2630,48 @@
"\n"
"Fazer backup dos seus chaveiros agora?"
-#: Src/wptKeygenDlg.cpp:291
+#: Src/wptKeygenDlg.cpp:289
msgid "WARNING - Important hint"
msgstr "AVISO - Conselho importante"
-#: Src/wptKeygenDlg.cpp:293
+#: Src/wptKeygenDlg.cpp:291
msgid "Destination for Public Keyring"
msgstr "Destino para chaveiro público"
-#: Src/wptKeygenDlg.cpp:299 Src/wptKeygenDlg.cpp:308
+#: Src/wptKeygenDlg.cpp:297 Src/wptKeygenDlg.cpp:306
#, c-format
msgid "Could not copy %s -> %s"
msgstr "Não foi possível copiar %s -> %s"
-#: Src/wptKeygenDlg.cpp:302
+#: Src/wptKeygenDlg.cpp:300
msgid "Destination for Secret Keyring"
msgstr "Destino para chaveiro privado"
-#: Src/wptKeygenDlg.cpp:324
+#: Src/wptKeygenDlg.cpp:322
msgid "DSA and ELG (default)"
msgstr "DSA e ELG (padrão)"
-#: Src/wptKeygenDlg.cpp:325
+#: Src/wptKeygenDlg.cpp:323
msgid "DSA and RSA"
msgstr "DSA e RSA"
-#: Src/wptKeygenDlg.cpp:326
+#: Src/wptKeygenDlg.cpp:324
msgid "DSA sign only"
msgstr "DSA (somente assinatura)"
-#: Src/wptKeygenDlg.cpp:327
+#: Src/wptKeygenDlg.cpp:325
msgid "RSA sign only"
msgstr "RSA (somente assinatura)"
-#: Src/wptKeygenDlg.cpp:328
+#: Src/wptKeygenDlg.cpp:326
msgid "RSA sign and encrypt"
msgstr "RSA (assinatura e cifragem)"
-#: Src/wptKeygenDlg.cpp:329
+#: Src/wptKeygenDlg.cpp:327
msgid "RSA and RSA (PGP)"
msgstr "RSA e RSA (PGP)"
-#: Src/wptKeygenDlg.cpp:373
+#: Src/wptKeygenDlg.cpp:371
#, fuzzy
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
@@ -2681,67 +2680,67 @@
"NOTA: A geração de chaves pode ser um processo demorado! Por favor aguarde "
"até receber a mensagem de que a geração de chaves foi concluída."
-#: Src/wptKeygenDlg.cpp:375
+#: Src/wptKeygenDlg.cpp:373
msgid "Subkey size in &bits"
msgstr "Tamanho da subchave em &bits"
-#: Src/wptKeygenDlg.cpp:376
+#: Src/wptKeygenDlg.cpp:374
msgid "&Real name"
msgstr "&Nome real"
-#: Src/wptKeygenDlg.cpp:380
+#: Src/wptKeygenDlg.cpp:378
msgid "Key &type"
msgstr "&Tipo de chave"
-#: Src/wptKeygenDlg.cpp:415
+#: Src/wptKeygenDlg.cpp:413
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Valor inválido. Valores permitidos 1024-4096 bits."
-#: Src/wptKeygenDlg.cpp:420
+#: Src/wptKeygenDlg.cpp:418
msgid "Do you really need such a large key?"
msgstr "Você realmente precisa de uma chave tão grande?"
-#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
+#: Src/wptKeygenDlg.cpp:424 Src/wptKeygenDlg.cpp:556
msgid "Please enter the name."
msgstr "Por favor insira o nome."
-#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
+#: Src/wptKeygenDlg.cpp:428 Src/wptKeygenDlg.cpp:561
msgid "Please do not enter the email address in the name field."
msgstr "Por favor não insira o e-mail no campo nome."
-#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
+#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:568
msgid "Please enter a valid email address."
msgstr "Por favor insira um e-mail válido."
-#: Src/wptKeygenDlg.cpp:445
+#: Src/wptKeygenDlg.cpp:443
msgid "Please do NOT enter the email address in the comment field."
msgstr "Por favor NÃO insira o e-mail no campo comentário."
-#: Src/wptKeygenDlg.cpp:476 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:474 Src/wptKeyRevokeDlg.cpp:180
msgid "Please enter the passphrase."
msgstr "Por favor insira a frase secreta."
-#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
+#: Src/wptKeygenDlg.cpp:499 Src/wptKeygenDlg.cpp:600
msgid "Key Generation completed"
msgstr "Geração de chaves concluída"
-#: Src/wptKeygenDlg.cpp:542
+#: Src/wptKeygenDlg.cpp:540
msgid "&Prefer RSA keys"
msgstr "&Preferir chaves RSA"
-#: Src/wptKeygenDlg.cpp:543
+#: Src/wptKeygenDlg.cpp:541
msgid "Real name:"
msgstr "Nome real:"
-#: Src/wptKeygenDlg.cpp:544
+#: Src/wptKeygenDlg.cpp:542
msgid "Email address:"
msgstr "Endereço de e-mail:"
-#: Src/wptKeygenDlg.cpp:545
+#: Src/wptKeygenDlg.cpp:543
msgid "Name and E-Mail Assignment"
msgstr "Atribuição de nome e e-mail"
-#: Src/wptKeygenDlg.cpp:546
+#: Src/wptKeygenDlg.cpp:544
#, fuzzy
msgid ""
"Every key pair must have a name associated with it. The name and\n"
@@ -2752,7 +2751,7 @@
"e-mail permitem a seus correspondentes saber que a chave pública que\n"
"estão usando pertence a nós."
-#: Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:545
#, fuzzy
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
@@ -2763,13 +2762,13 @@
"seus correspondentes a selecionar a chave pública\n"
"correta ao comunicar-se com você."
-#: Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:559 Src/wptKeygenDlg.cpp:564
-#: Src/wptKeygenDlg.cpp:571 Src/wptKeygenDlg.cpp:577 Src/wptKeygenDlg.cpp:598
-#: Src/wptKeyManagerDlg.cpp:1811
+#: Src/wptKeygenDlg.cpp:546 Src/wptKeygenDlg.cpp:557 Src/wptKeygenDlg.cpp:562
+#: Src/wptKeygenDlg.cpp:569 Src/wptKeygenDlg.cpp:575 Src/wptKeygenDlg.cpp:596
+#: Src/wptKeyManagerDlg.cpp:1805
msgid "Key Generation Wizard"
msgstr "Assistente de geração de chave"
-#: Src/wptKeygenDlg.cpp:576
+#: Src/wptKeygenDlg.cpp:574
msgid "Please do not add '<' or '>' to the email address."
msgstr "Por favor não adicione '<' ou '>' ao endereço de e-mail."
@@ -2853,17 +2852,17 @@
msgid "key pair"
msgstr "par de chaves"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
-#: Src/wptKeyManagerDlg.cpp:1007
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1005
msgid "Cipher"
msgstr "Cifragem"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
-#: Src/wptVerifyList.cpp:164
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptVerifyList.cpp:171
msgid "Trust"
msgstr "Confiança"
-#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:124
+#: Src/wptKeylist.cpp:766 Src/wptPassphraseCB.cpp:125
msgid "Invalid User ID"
msgstr "ID de usuário inválida"
@@ -3032,48 +3031,48 @@
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "Você realmente deseja enviar '0x%s' para o servidor %s?"
-#: Src/wptKeyManager.cpp:851
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "Por favor selecione apenas uma chave."
-#: Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:929
msgid "Do you really want to refresh all keys in the keyring?"
msgstr "Você realmente deseja atualizar todas as chaves do chaveiro?"
-#: Src/wptKeyManager.cpp:932
+#: Src/wptKeyManager.cpp:934
msgid "Could not connect to keyserver, abort procedure."
msgstr "Não foi possível conectar-se ao servidor, abortando procedimento."
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search"
msgstr "Localizar"
-#: Src/wptKeyManager.cpp:1006
+#: Src/wptKeyManager.cpp:1008
msgid "Search for:"
msgstr "Procurar por:"
-#: Src/wptKeyManager.cpp:1018
+#: Src/wptKeyManager.cpp:1020
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Padrão \"%s\" não encontrado."
-#: Src/wptKeyManager.cpp:1084 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. Nenhuma razão especificada"
-#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:86
msgid "1. Key has been compromised"
msgstr "1. Chave foi comprometida"
-#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1088 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. Chave foi substituída"
-#: Src/wptKeyManager.cpp:1087 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1089 Src/wptKeyRevokeDlg.cpp:88
msgid "3. Key is no longer used"
msgstr "3. Chave não é mais usada"
-#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1026
msgid "Paste Key from Clipboard"
msgstr "Colar chave da área de transferência"
@@ -3087,193 +3086,208 @@
msgid "Default Key: 0x%s"
msgstr "Chave padrão: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:532
+#: Src/wptKeyManagerDlg.cpp:529
#, c-format
msgid "%d secret keys"
msgstr "%d chaves privadas"
-#: Src/wptKeyManagerDlg.cpp:533
+#: Src/wptKeyManagerDlg.cpp:530
#, c-format
msgid "%d keys"
msgstr "%d chaves"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:969
msgid "Key"
msgstr "Chave"
-#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
+#: Src/wptKeyManagerDlg.cpp:970 Src/wptKeyManagerDlg.cpp:1361
msgid "Groups"
msgstr "Grupos"
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:973
msgid "Send Mail..."
msgstr "Enviar mensagem..."
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:975
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:976
msgid "&Paste\tCtrl+V"
msgstr "Co&lar\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:977
msgid "Search...\tCtrl+F"
msgstr "Localizar...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:978
msgid "Select All\tCtrl+A"
msgstr "Selecionar tudo\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:982
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Quit"
msgstr "Sai&r"
-#: Src/wptKeyManagerDlg.cpp:984
+#: Src/wptKeyManagerDlg.cpp:981
msgid "&Expert"
msgstr "&Avançado"
-#: Src/wptKeyManagerDlg.cpp:985
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:985 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptKeyManagerDlg.cpp:1032
msgid "&Delete"
msgstr "E&xcluir"
-#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1033
msgid "&Revoke Cert"
msgstr "Certificado de &Revogação"
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1029
msgid "&List Signatures"
msgstr "&Listar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
+#: Src/wptKeyManagerDlg.cpp:989 Src/wptKeyManagerDlg.cpp:1722
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Listar caminho de confiança"
-#: Src/wptKeyManagerDlg.cpp:993
+#: Src/wptKeyManagerDlg.cpp:990
msgid "&Export..."
msgstr "&Exportar..."
-#: Src/wptKeyManagerDlg.cpp:994
+#: Src/wptKeyManagerDlg.cpp:991
msgid "&Import..."
msgstr "&Importar..."
-#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
-#: Src/wptKeysigDlg.cpp:419
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeysigDlg.cpp:427
msgid "&Properties"
msgstr "&Propriedades"
-#: Src/wptKeyManagerDlg.cpp:999
+#: Src/wptKeyManagerDlg.cpp:993
+#, fuzzy
+msgid "GPG &Options"
+msgstr "Opções do GnuPG"
+
+#: Src/wptKeyManagerDlg.cpp:994
+#, fuzzy
+msgid "&GPG Preferences"
+msgstr "Preferências do GnuPG"
+
+#: Src/wptKeyManagerDlg.cpp:995
+#, fuzzy
+msgid "&WinPT Preferences"
+msgstr "Preferências do WinPT"
+
+#: Src/wptKeyManagerDlg.cpp:997
msgid "E&xport Secret Key"
msgstr "Exportar &chave privada"
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:998
msgid "Re&load Key Cache"
msgstr "&Recarregar cache de chaves"
-#: Src/wptKeyManagerDlg.cpp:1001
+#: Src/wptKeyManagerDlg.cpp:999
msgid "R&everify Signatures"
msgstr "Re&verificar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:1002
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Refresh &Keys (Keyserver)"
msgstr "Recarregar c&haves (servidor)"
-#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1001 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Sobre o WinPT"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1020
msgid "Copy User ID to Clipboard"
msgstr "Copiar ID de usuário para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:1021
msgid "Copy Key ID to Clipboard"
msgstr "Copiar ID da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy Fingerprint to Clipboard"
msgstr "Copiar impressão digital para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key Info to Clipboard"
msgstr "Copiar informações da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:1024
#, fuzzy
msgid "Copy E-Mail to Clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Copy Key to Clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Refresh from Keyserver"
msgstr "Atualizar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:1028
msgid "Set Implicit &Trust"
msgstr "Definir confiança implíci&ta"
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1035
msgid "&Enable"
msgstr "&Ativar"
-#: Src/wptKeyManagerDlg.cpp:1038
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Disable"
msgstr "&Desativar"
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "Re&fresh from Keyserver"
msgstr "Atuali&zar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "Set preferred Keyserver URL"
msgstr "Definir URL do servidor preferido"
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Send Key to Mail Recipient"
msgstr "Enviar chave a destinatário de correio"
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set as Default Key"
msgstr "Definir como chave padrão"
-#: Src/wptKeyManagerDlg.cpp:1044
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Key..."
msgstr "Chave..."
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1043
msgid "User ID..."
msgstr "ID de usuário..."
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Photo ID..."
msgstr "Foto-ID..."
-#: Src/wptKeyManagerDlg.cpp:1047
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "Revoker..."
msgstr "Revogador..."
-#: Src/wptKeyManagerDlg.cpp:1050
+#: Src/wptKeyManagerDlg.cpp:1048
msgid "Key Attributes"
msgstr "Atributos da chave"
-#: Src/wptKeyManagerDlg.cpp:1051
+#: Src/wptKeyManagerDlg.cpp:1049
msgid "Add"
msgstr "Adicionar"
-#: Src/wptKeyManagerDlg.cpp:1052
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Send to Keyserver"
msgstr "Enviar a servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1335
+#: Src/wptKeyManagerDlg.cpp:1333
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3281,72 +3295,77 @@
"Nenhuma chave com confiança definitiva encontrada.\n"
"Por favor marque ao menos uma chave privada com confiança definitiva."
-#: Src/wptKeyManagerDlg.cpp:1364
+#: Src/wptKeyManagerDlg.cpp:1362
#, fuzzy
msgid "&Show"
msgstr "&Mostrar a fotografia"
-#: Src/wptKeyManagerDlg.cpp:1365
+#: Src/wptKeyManagerDlg.cpp:1363
#, fuzzy
msgid "&New..."
msgstr "&Abrir..."
-#: Src/wptKeyManagerDlg.cpp:1477
+#: Src/wptKeyManagerDlg.cpp:1475
msgid "Generate new key pair"
msgstr "Gerar novo par de chaves"
-#: Src/wptKeyManagerDlg.cpp:1481
+#: Src/wptKeyManagerDlg.cpp:1479
msgid "Search for a specific key"
msgstr "Localizar chave específica"
-#: Src/wptKeyManagerDlg.cpp:1485
+#: Src/wptKeyManagerDlg.cpp:1483
msgid "Delete key from keyring"
msgstr "Excluir chave do chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1489
+#: Src/wptKeyManagerDlg.cpp:1487
msgid "Show key properties"
msgstr "Exibir propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1493
+#: Src/wptKeyManagerDlg.cpp:1491
msgid "Sign key"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1497
+#: Src/wptKeyManagerDlg.cpp:1495
msgid "Copy key to clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1501
+#: Src/wptKeyManagerDlg.cpp:1499
msgid "Paste key from clipboard"
msgstr "Colar chave da área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1505
+#: Src/wptKeyManagerDlg.cpp:1503
msgid "Import key to keyring"
msgstr "Importar chave para o chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1509
+#: Src/wptKeyManagerDlg.cpp:1507
msgid "Export key to a file"
msgstr "Exportar chave para um arquivo"
-#: Src/wptKeyManagerDlg.cpp:1643
+#: Src/wptKeyManagerDlg.cpp:1641
msgid "New"
msgstr "Nova"
-#: Src/wptKeyManagerDlg.cpp:1655
+#: Src/wptKeyManagerDlg.cpp:1643
+#, fuzzy
+msgid "Preferences..."
+msgstr "Preferências"
+
+#: Src/wptKeyManagerDlg.cpp:1649
msgid "Could not access public keyring"
msgstr "Não foi possível acessar o chaveiro público"
-#: Src/wptKeyManagerDlg.cpp:1687 Src/wptKeysignDlg.cpp:325
-#: Src/wptKeysignDlg.cpp:339 Src/wptKeysignDlg.cpp:400
-#: Src/wptKeysignDlg.cpp:429 Src/wptKeysignDlg.cpp:434
-#: Src/wptKeysignDlg.cpp:439
+#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeysignDlg.cpp:351
+#: Src/wptKeysignDlg.cpp:365 Src/wptKeysignDlg.cpp:426
+#: Src/wptKeysignDlg.cpp:456 Src/wptKeysignDlg.cpp:461
+#: Src/wptKeysignDlg.cpp:466
msgid "Key Signing"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1703
+#: Src/wptKeyManagerDlg.cpp:1697
msgid "Key already revoked!"
msgstr "Chave já revogada!"
-#: Src/wptKeyManagerDlg.cpp:1717 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1711 Src/wptKeyRevokeDlg.cpp:68
#: Src/wptKeyRevokeDlg.cpp:78 Src/wptKeyRevokeDlg.cpp:162
#: Src/wptKeyRevokeDlg.cpp:167 Src/wptKeyRevokeDlg.cpp:172
#: Src/wptKeyRevokeDlg.cpp:181 Src/wptKeyRevokeDlg.cpp:191
@@ -3354,15 +3373,15 @@
msgid "Key Revocation Cert"
msgstr "Certificado de revogação da chave"
-#: Src/wptKeyManagerDlg.cpp:1739
+#: Src/wptKeyManagerDlg.cpp:1733
msgid "Key Signature List"
msgstr "Lista de assinaturas da chave"
-#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1750 Src/wptKeyPropsDlg.cpp:282
msgid "Key Properties"
msgstr "Propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1766
+#: Src/wptKeyManagerDlg.cpp:1760
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3371,14 +3390,19 @@
"chave...).\n"
"Você realmente quer recarregar o cache de chaves?"
-#: Src/wptKeyManagerDlg.cpp:1796
+#: Src/wptKeyManagerDlg.cpp:1790
msgid "Smart Card support is not available."
msgstr "Suporte a Smart Card indisponível."
-#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1813 Src/wptKeyserverDlg.cpp:580
msgid "Keyserver Access"
msgstr "Acesso ao servidor de chaves"
+#: Src/wptKeyManagerDlg.cpp:1821 Src/wptMainProc.cpp:571
+#: Src/wptPreferencesDlg.cpp:139
+msgid "WinPT Preferences"
+msgstr "Preferências do WinPT"
+
#: Src/wptKeyManagerDlg.cpp:1836
msgid "GnuPG Options"
msgstr "Opções do GnuPG"
@@ -3413,11 +3437,11 @@
msgid "WARNING"
msgstr "ATENÇÃO"
-#: Src/wptKeyManagerDlg.cpp:1954
+#: Src/wptKeyManagerDlg.cpp:1959
msgid "No key was selected, select all by default."
msgstr "Nenhuma chave selecionada, selecionando todas por padrão."
-#: Src/wptKeyManagerDlg.cpp:1959
+#: Src/wptKeyManagerDlg.cpp:1964
#, fuzzy
msgid "Keyserver refresh finished."
msgstr "Procurando no servidor de chaves"
@@ -3426,8 +3450,8 @@
msgid "I trust ultimately (implicit)"
msgstr "Eu confio definitivamente (implícito)"
-#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:239
-#: Src/wptVerifyList.cpp:302
+#: Src/wptKeyPropsDlg.cpp:72 Src/wptVerifyList.cpp:246
+#: Src/wptVerifyList.cpp:309
msgid "Unknown"
msgstr "Desconhecida"
@@ -3436,12 +3460,12 @@
msgid "Invalid"
msgstr "URL inválida."
-#: Src/wptKeyPropsDlg.cpp:204
+#: Src/wptKeyPropsDlg.cpp:205
#, c-format
msgid "Card-Type: %s\r\n"
msgstr "Tipo de cartão: %s\r\n"
-#: Src/wptKeyPropsDlg.cpp:243
+#: Src/wptKeyPropsDlg.cpp:244
#, fuzzy, c-format
msgid ""
"Type: %s\r\n"
@@ -3464,23 +3488,23 @@
"Cifra: %s\r\n"
"%s\r\n"
-#: Src/wptKeyPropsDlg.cpp:282
+#: Src/wptKeyPropsDlg.cpp:283
msgid "&Change"
msgstr "&Alterar"
-#: Src/wptKeyPropsDlg.cpp:283
+#: Src/wptKeyPropsDlg.cpp:284
msgid "&Revokers"
msgstr "&Revogadores"
-#: Src/wptKeyPropsDlg.cpp:284
+#: Src/wptKeyPropsDlg.cpp:285
msgid "Change &Password"
msgstr "Alterar &senha"
-#: Src/wptKeyPropsDlg.cpp:291
+#: Src/wptKeyPropsDlg.cpp:292
msgid "Photo-ID not validated."
msgstr "Foto-ID não validado."
-#: Src/wptKeyPropsDlg.cpp:354
+#: Src/wptKeyPropsDlg.cpp:355
msgid ""
"The status of this key is 'revoked' or 'expired'.\n"
"You cannot change the ownertrust of such keys."
@@ -3488,7 +3512,7 @@
"O estado dessa chave é 'revogada' ou 'expirada'.\n"
"Você não pode alterar a confiança dessas chaves."
-#: Src/wptKeyPropsDlg.cpp:360
+#: Src/wptKeyPropsDlg.cpp:361
msgid ""
"This is a non-valid key.\n"
"Modifying the ownertrust has no effect on such keys.\n"
@@ -3500,11 +3524,11 @@
"\n"
"Você realmente deseja continuar?"
-#: Src/wptKeyPropsDlg.cpp:378
+#: Src/wptKeyPropsDlg.cpp:379
msgid "Ownertrust successfully changed."
msgstr "Confiança alterada com sucesso."
-#: Src/wptKeyPropsDlg.cpp:391 Src/wptKeyRevokersDlg.cpp:160
+#: Src/wptKeyPropsDlg.cpp:392 Src/wptKeyRevokersDlg.cpp:160
msgid "Key Revokers"
msgstr "Revogadores de chave"
@@ -3655,11 +3679,11 @@
msgid "Key(s) sucessfully received and imported."
msgstr "Chave(s) recebida(s) e importada(s) com sucesso."
-#: Src/wptKeyserverDlg.cpp:160
+#: Src/wptKeyserverDlg.cpp:161
msgid "Imported Keys"
msgstr "Chaves importadas"
-#: Src/wptKeyserverDlg.cpp:186
+#: Src/wptKeyserverDlg.cpp:187
msgid ""
"LDAP key import failed.\n"
"Please make sure you have an online connection and gpgkeys_ldap.exe is "
@@ -3669,110 +3693,111 @@
"Por favor verifique se sua conexão está ativa e gpgkeys_ldap.exe está "
"instalado"
-#: Src/wptKeyserverDlg.cpp:198
+#: Src/wptKeyserverDlg.cpp:199
#, c-format
msgid "Finger key import failed: %s\n"
msgstr "Importação de chaves via Finger falhou: %s\n"
-#: Src/wptKeyserverDlg.cpp:212
+#: Src/wptKeyserverDlg.cpp:213
msgid "This is not a valid OpenPGP key."
msgstr "Essa não é uma chave OpenPGP válida."
-#: Src/wptKeyserverDlg.cpp:361
+#: Src/wptKeyserverDlg.cpp:363
msgid "Please select one of the servers."
msgstr "Por favor selecione um dos servidores."
-#: Src/wptKeyserverDlg.cpp:366
-msgid "Only HTTP keyserver can be used."
+#: Src/wptKeyserverDlg.cpp:369
+#, fuzzy
+msgid "Only HKP keyserver can be used."
msgstr "Apenas servidores de chaves HTTP podem ser usados."
-#: Src/wptKeyserverDlg.cpp:383
+#: Src/wptKeyserverDlg.cpp:386
msgid "DNS Name"
msgstr "Nome DNS"
-#: Src/wptKeyserverDlg.cpp:384
+#: Src/wptKeyserverDlg.cpp:387
msgid "Port"
msgstr "Porta"
-#: Src/wptKeyserverDlg.cpp:468
+#: Src/wptKeyserverDlg.cpp:471
msgid "No space for new keyserver entry"
msgstr "Sem espaço para nova entrada de servidor de chaves"
-#: Src/wptKeyserverDlg.cpp:489
+#: Src/wptKeyserverDlg.cpp:492
msgid "HKP Keyserver"
msgstr "Servidor de chaves HKP"
-#: Src/wptKeyserverDlg.cpp:490
+#: Src/wptKeyserverDlg.cpp:493
msgid "LDAP Keyserver"
msgstr "Servidor de chaves LDAP"
-#: Src/wptKeyserverDlg.cpp:491
+#: Src/wptKeyserverDlg.cpp:494
msgid "Finger Keyserver"
msgstr "Servidor de chaves Finger"
-#: Src/wptKeyserverDlg.cpp:516 Src/wptKeyserverDlg.cpp:733
-#: Src/wptKeyserverDlg.cpp:753
+#: Src/wptKeyserverDlg.cpp:519 Src/wptKeyserverDlg.cpp:736
+#: Src/wptKeyserverDlg.cpp:756
msgid "Edit Keyserver"
msgstr "Editar servidor de chaves"
-#: Src/wptKeyserverDlg.cpp:517 Src/wptKeyserverDlg.cpp:609
+#: Src/wptKeyserverDlg.cpp:520 Src/wptKeyserverDlg.cpp:612
msgid "&Add"
msgstr "&Adicionar"
-#: Src/wptKeyserverDlg.cpp:519
+#: Src/wptKeyserverDlg.cpp:522
msgid "Type:"
msgstr "Tipo:"
-#: Src/wptKeyserverDlg.cpp:520
+#: Src/wptKeyserverDlg.cpp:523
msgid "Port:"
msgstr "Porta:"
-#: Src/wptKeyserverDlg.cpp:521
+#: Src/wptKeyserverDlg.cpp:524
msgid "Host name:"
msgstr "Servidor:"
-#: Src/wptKeyserverDlg.cpp:529
+#: Src/wptKeyserverDlg.cpp:532
msgid "Please enter a host name"
msgstr "Por favor insira um nome de servidor"
-#: Src/wptKeyserverDlg.cpp:534
+#: Src/wptKeyserverDlg.cpp:537
msgid "Invalid port, valid numbers are < 65535"
msgstr "Porta inválida; números válidos são < 65535"
-#: Src/wptKeyserverDlg.cpp:578 Src/wptKeyserverSearchDlg.cpp:65
+#: Src/wptKeyserverDlg.cpp:581 Src/wptKeyserverSearchDlg.cpp:65
msgid "&Receive"
msgstr "&Receber"
-#: Src/wptKeyserverDlg.cpp:580
+#: Src/wptKeyserverDlg.cpp:583
msgid "Send key (default is receiving)"
msgstr "Enviar chave (padrão é receber)"
-#: Src/wptKeyserverDlg.cpp:582
+#: Src/wptKeyserverDlg.cpp:585
#, fuzzy
msgid "Key ID or email address you want to search for"
msgstr "Por favor insira o ID ou o e-mail da chave que você procura"
-#: Src/wptKeyserverDlg.cpp:583
+#: Src/wptKeyserverDlg.cpp:586
msgid "&Search"
msgstr "&Localizar"
-#: Src/wptKeyserverDlg.cpp:584
+#: Src/wptKeyserverDlg.cpp:587
msgid "C&hange proxy"
msgstr "&Mudar proxy"
-#: Src/wptKeyserverDlg.cpp:585
+#: Src/wptKeyserverDlg.cpp:588
msgid "Set &default"
msgstr "Definir como &padrão"
-#: Src/wptKeyserverDlg.cpp:610
+#: Src/wptKeyserverDlg.cpp:613
msgid "&Remove"
msgstr "&Remover"
-#: Src/wptKeyserverDlg.cpp:611
+#: Src/wptKeyserverDlg.cpp:614
msgid "&Edit"
msgstr "&Editar"
-#: Src/wptKeyserverDlg.cpp:645 Src/wptProxySettingsDlg.cpp:73
+#: Src/wptKeyserverDlg.cpp:648 Src/wptProxySettingsDlg.cpp:73
#: Src/wptProxySettingsDlg.cpp:83 Src/wptProxySettingsDlg.cpp:88
#: Src/wptProxySettingsDlg.cpp:95 Src/wptProxySettingsDlg.cpp:100
#: Src/wptProxySettingsDlg.cpp:105 Src/wptProxySettingsDlg.cpp:164
@@ -3780,23 +3805,23 @@
msgid "Proxy Settings"
msgstr "Configurações de proxy"
-#: Src/wptKeyserverDlg.cpp:653 Src/wptKeyserverDlg.cpp:694
+#: Src/wptKeyserverDlg.cpp:656 Src/wptKeyserverDlg.cpp:697
msgid "Please enter the search pattern."
msgstr "Por favor insira o padrão de busca."
-#: Src/wptKeyserverDlg.cpp:678
+#: Src/wptKeyserverDlg.cpp:681
msgid "Please select one of the keyservers."
msgstr "Por favor selecione um dos servidores."
-#: Src/wptKeyserverDlg.cpp:699
+#: Src/wptKeyserverDlg.cpp:702
msgid "Only keyids are allowed."
msgstr "Apenas IDs de chave são permitidos."
-#: Src/wptKeyserverDlg.cpp:705
+#: Src/wptKeyserverDlg.cpp:708
msgid "Only enter the name of the user."
msgstr "Insira apenas o nome do usuário."
-#: Src/wptKeyserverDlg.cpp:711
+#: Src/wptKeyserverDlg.cpp:714
msgid "Only email addresses or keyids are allowed."
msgstr "Apenas e-mails ou IDs de chave são permitidos."
@@ -3809,12 +3834,12 @@
msgid "Keyserver Searching"
msgstr "Procurando no servidor de chaves"
-#: Src/wptKeyserverSearchDlg.cpp:94 Src/wptKeyserverSearchDlg.cpp:99
-#: Src/wptKeyserverSearchDlg.cpp:143
+#: Src/wptKeyserverSearchDlg.cpp:95 Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:144
msgid "Keyserver Search"
msgstr "Busca no servidor de chaves"
-#: Src/wptKeyserverSearchDlg.cpp:100
+#: Src/wptKeyserverSearchDlg.cpp:101
#, fuzzy, c-format
msgid ""
"The search result contains a lot of keys: %d\n"
@@ -3845,80 +3870,85 @@
msgid "signature"
msgstr "assinatura"
-#: Src/wptKeysigDlg.cpp:131
+#: Src/wptKeysigDlg.cpp:147
#, c-format
msgid "%s %s signature"
msgstr "%s %s assinatura"
-#: Src/wptKeysigDlg.cpp:139 Src/wptKeysigDlg.cpp:163 Src/wptKeysigDlg.cpp:205
+#: Src/wptKeysigDlg.cpp:155 Src/wptKeysigDlg.cpp:180 Src/wptKeysigDlg.cpp:213
msgid "Exportable"
msgstr "Exportável"
-#: Src/wptKeysigDlg.cpp:140 Src/wptKeysigDlg.cpp:206
+#: Src/wptKeysigDlg.cpp:156 Src/wptKeysigDlg.cpp:214
msgid "Non-revocably"
msgstr "Não-revogável"
-#: Src/wptKeysigDlg.cpp:143 Src/wptSigList.cpp:55
+#: Src/wptKeysigDlg.cpp:159 Src/wptSigList.cpp:55
msgid "Class"
msgstr "Classe"
-#: Src/wptKeysigDlg.cpp:144
+#: Src/wptKeysigDlg.cpp:160
msgid "Expire date"
msgstr "Data de expiração"
-#: Src/wptKeysigDlg.cpp:145
+#: Src/wptKeysigDlg.cpp:161
+#, fuzzy
+msgid "Creation date"
+msgstr "Criação"
+
+#: Src/wptKeysigDlg.cpp:162
msgid "Issuer key"
msgstr "Chave do emissor"
-#: Src/wptKeysigDlg.cpp:146
+#: Src/wptKeysigDlg.cpp:163
msgid "Issuer key ID"
msgstr "ID da chave do emissor"
-#: Src/wptKeysigDlg.cpp:147
+#: Src/wptKeysigDlg.cpp:164
#, fuzzy
msgid "Policy URL"
msgstr "URL de política"
-#: Src/wptKeysigDlg.cpp:148 Src/wptKeysigDlg.cpp:209
+#: Src/wptKeysigDlg.cpp:165 Src/wptKeysigDlg.cpp:217
msgid "Signature Properties"
msgstr "Propriedades da assinatura"
-#: Src/wptKeysigDlg.cpp:163
+#: Src/wptKeysigDlg.cpp:180
msgid "Non-exportable"
msgstr "Não-exportável"
-#: Src/wptKeysigDlg.cpp:176 Src/wptSigList.cpp:153
+#: Src/wptKeysigDlg.cpp:193 Src/wptSigList.cpp:153
msgid " user ID not found"
msgstr " ID do usuário não encontrada"
-#: Src/wptKeysigDlg.cpp:308
+#: Src/wptKeysigDlg.cpp:316
msgid "Really receive all missing keys?"
msgstr "Realmente receber todas as chaves faltantes?"
-#: Src/wptKeysigDlg.cpp:342 Src/wptSigTreeDlg.cpp:115
+#: Src/wptKeysigDlg.cpp:350 Src/wptSigTreeDlg.cpp:115
msgid "Signature &Properties"
msgstr "&Propriedades da assinatura"
-#: Src/wptKeysigDlg.cpp:343
+#: Src/wptKeysigDlg.cpp:351
msgid "Signing &Key Properties"
msgstr "Propriedades da &chave da assinatura"
-#: Src/wptKeysigDlg.cpp:380
+#: Src/wptKeysigDlg.cpp:388
msgid "Key not found in keyring, do you want to fetch it from the keyserver?"
msgstr ""
"Chave não encontrada no chaveiro. Você gostaria de obtê-la do servidor de "
"chaves?"
-#: Src/wptKeysigDlg.cpp:391
+#: Src/wptKeysigDlg.cpp:399
msgid "Key not found in keyring."
msgstr "Chave não encontrada no chaveiro."
-#: Src/wptKeysigDlg.cpp:416
+#: Src/wptKeysigDlg.cpp:424
#, c-format
msgid "Signature List for \"%s\""
msgstr "Lista de assinaturas para \"%s\""
-#: Src/wptKeysigDlg.cpp:418
+#: Src/wptKeysigDlg.cpp:426
msgid "&Receive Key"
msgstr "&Receber chave"
@@ -3932,7 +3962,7 @@
msgid "Photo of %s"
msgstr ""
-#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:383
+#: Src/wptKeysignDlg.cpp:222 Src/wptKeysignDlg.cpp:409
msgid "Choose Signature Class"
msgstr "Escolher classe da assinatura"
@@ -3965,16 +3995,29 @@
msgid "never"
msgstr "nunca"
-#: Src/wptKeysignDlg.cpp:313
-#, c-format
+#: Src/wptKeysignDlg.cpp:304
+#, fuzzy, c-format
msgid ""
-"pub %d/%s created: %s expires: %s\n"
+"pub %d/0x%s created: %s expires: %s\n"
"\n"
"Primary key fingerprint: %s\n"
"\n"
+msgstr ""
+"púb %d/%s criada: %s expira: %s\n"
+"\n"
+"Impressão digital da chave primária: %s\n"
+"\n"
"\t%s\n"
"\n"
"\n"
+"Você tem realmente certeza de que você deseja assinar esta chave com a SUA "
+"chave?\n"
+
+#: Src/wptKeysignDlg.cpp:321
+#, fuzzy
+msgid ""
+"\n"
+"\n"
"Are you really sure that you want to sign this key with YOUR key?\n"
msgstr ""
"púb %d/%s criada: %s expira: %s\n"
@@ -3987,41 +4030,41 @@
"Você tem realmente certeza de que você deseja assinar esta chave com a SUA "
"chave?\n"
-#: Src/wptKeysignDlg.cpp:325
+#: Src/wptKeysignDlg.cpp:351
msgid "No valid secret key found."
msgstr "Nenhuma chave privada válida encontrada."
-#: Src/wptKeysignDlg.cpp:331
+#: Src/wptKeysignDlg.cpp:357
msgid "Sign local only (non exportable signature)"
msgstr "Assinar apenas localmente (assinatura não-exportável)"
-#: Src/wptKeysignDlg.cpp:332
+#: Src/wptKeysignDlg.cpp:358
msgid "Signature expires on"
msgstr "Assinatura expira em"
-#: Src/wptKeysignDlg.cpp:333
+#: Src/wptKeysignDlg.cpp:359
msgid "Sign non-revocably"
msgstr "Assinar não-revogavelmente"
-#: Src/wptKeysignDlg.cpp:334
+#: Src/wptKeysignDlg.cpp:360
msgid "&Ask for certification level"
msgstr "&Perguntar por nível de certeza"
-#: Src/wptKeysignDlg.cpp:337
+#: Src/wptKeysignDlg.cpp:363
msgid "&Show photo"
msgstr "&Mostrar a fotografia"
-#: Src/wptKeysignDlg.cpp:338 Src/wptPassphraseCB.cpp:96
-#: Src/wptPassphraseCB.cpp:102 Src/wptPassphraseDlg.cpp:103
+#: Src/wptKeysignDlg.cpp:364 Src/wptPassphraseCB.cpp:97
+#: Src/wptPassphraseCB.cpp:103 Src/wptPassphraseDlg.cpp:103
#: Src/wptPINDlg.cpp:53
msgid "&Hide Typing"
msgstr "&Esconder digitação"
-#: Src/wptKeysignDlg.cpp:399
+#: Src/wptKeysignDlg.cpp:425
msgid "You cannot select today as the expiration date."
msgstr "Você não pode selecionar o dia de hoje como data de expiração."
-#: Src/wptKeysignDlg.cpp:433
+#: Src/wptKeysignDlg.cpp:460
msgid "This key is already signed by your key"
msgstr "Essa chave já está assinada pela sua chave"
@@ -4029,59 +4072,59 @@
msgid "Trustlist"
msgstr "Lista de confiança"
-#: Src/wptMainProc.cpp:104
+#: Src/wptMainProc.cpp:103
msgid "Delete Clipboard Contents"
msgstr "Limpar área de transferência"
-#: Src/wptMainProc.cpp:106
+#: Src/wptMainProc.cpp:105
msgid "&Remember the answer"
msgstr "&Lembrar a resposta"
-#: Src/wptMainProc.cpp:108
+#: Src/wptMainProc.cpp:107
msgid "Do you want to delete the contents from the clipboard?"
msgstr "Você deseja limpar o conteúdo da área de transferência?"
-#: Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:154
msgid "Could not access secret keyring."
msgstr "Não foi possível acessar o chaveiro secreto."
-#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:214 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Entrada de texto"
-#: Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:242
msgid "Unknown OpenPGP type."
msgstr "Tipo desconhecido ao OpenPGP."
-#: Src/wptMainProc.cpp:370
+#: Src/wptMainProc.cpp:342
msgid "Could not set current window mode hooks."
msgstr ""
-#: Src/wptMainProc.cpp:422
+#: Src/wptMainProc.cpp:394
msgid "About..."
msgstr "Sobre..."
-#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
+#: Src/wptMainProc.cpp:400 Src/wptMainProc.cpp:404
msgid "Decrypt/Verify"
msgstr "Decifrar/Verificar"
-#: Src/wptMainProc.cpp:443
+#: Src/wptMainProc.cpp:415
msgid "Current Window"
msgstr "Janela atual"
-#: Src/wptMainProc.cpp:501
+#: Src/wptMainProc.cpp:473
msgid "Remove all passphrases from cache?"
msgstr "Remover todas as frases secretas do cache?"
-#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:474 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr ""
-#: Src/wptMainProc.cpp:512
+#: Src/wptMainProc.cpp:484
msgid "Could not access public keyring, exit WinPT?"
msgstr "Não foi possível acessar o chaveiro público. Sair do WinPT?"
-#: Src/wptMainProc.cpp:545
+#: Src/wptMainProc.cpp:517
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4090,10 +4133,6 @@
"Verifique se a janela contém texto.\n"
"%s."
-#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
-msgid "WinPT Preferences"
-msgstr "Preferências do WinPT"
-
#: Src/wptMAPI.cpp:133 Src/wptMAPI.cpp:208
#, fuzzy
msgid "MAPI Login failed"
@@ -4159,24 +4198,24 @@
msgid "Ownertrust successfully imported."
msgstr "Confiança importada com sucesso."
-#: Src/wptPassphraseCB.cpp:98
+#: Src/wptPassphraseCB.cpp:99
msgid "Encrypted with the following public key(s)"
msgstr "Cifrado com a(s) seguinte(s) chave(s) pública(s)"
-#: Src/wptPassphraseCB.cpp:142
+#: Src/wptPassphraseCB.cpp:143
#, c-format
msgid "Unknown key ID (%s, 0x%s)"
msgstr "ID de chave desconhecida (%s, 0x%s)"
-#: Src/wptPassphraseCB.cpp:154
+#: Src/wptPassphraseCB.cpp:155
msgid "Bad passphrase; Enter passphrase again"
msgstr "Frase secreta incorreta; tente novamente"
-#: Src/wptPassphraseCB.cpp:155
+#: Src/wptPassphraseCB.cpp:156
msgid "Please enter your passphrase"
msgstr "Por favor insira sua frase secreta"
-#: Src/wptPassphraseCB.cpp:159
+#: Src/wptPassphraseCB.cpp:160
#, c-format
msgid ""
"Symmetric encryption.\n"
@@ -4186,22 +4225,22 @@
"Dados cifrados por %s."
#: Src/wptPassphraseCB.cpp:306
-#, c-format
+#, fuzzy, 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"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s (main key ID 0x%s)\n"
msgstr ""
"Você precisa de uma frase secreta para destravar a chave privada para\n"
"o usuário: \"%s\"\n"
"chave %s, ID %s (ID da chave principal %s)\n"
#: Src/wptPassphraseCB.cpp:312
-#, c-format
+#, fuzzy, c-format
msgid ""
-"You need a passphrase to unlock the secret key for\n"
-"user: \"%s\"\n"
-"%s key, ID %s\n"
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%s\"\n"
+"%s key, ID 0x%s\n"
msgstr ""
"Você precisa de uma frase secreta para destravar a chave privada para\n"
"o usuário: \"%s\"\n"
@@ -4518,21 +4557,31 @@
msgid "PKA: Verified signer's address is '%s'"
msgstr "PKA: Endereço verificado do signatário é '%s'"
-#: Src/wptVerifyList.cpp:130
+#: Src/wptVerifyList.cpp:136
msgid "The signature is expired!"
msgstr "A assinatura expirou!"
-#: Src/wptVerifyList.cpp:135
+#: Src/wptVerifyList.cpp:142
msgid ""
"WARNING: This key is not certified with a trusted signature!\r\n"
" There is no indication that the signature belongs to the "
"owner.\r\n"
msgstr ""
-#: Src/wptVerifyList.cpp:163
+#: Src/wptVerifyList.cpp:170
msgid "Signed"
msgstr "Assinada"
+#~ msgid ""
+#~ "Encrypted with %s key, ID %s.%s\n"
+#~ "Decryption failed: secret key not available."
+#~ msgstr ""
+#~ "Cifrado com chave %s, ID %s.%s\n"
+#~ "Decifragem falhou: chave privada indisponível."
+
+#~ msgid "No GPG error description available."
+#~ msgstr "Descrição indisponível para o erro do GPG."
+
#~ msgid "Admin PIN must be minimal 8 characters."
#~ msgstr "PIN do administrador deve ter no mínimo 8 caracteres."
Modified: trunk/README
===================================================================
--- trunk/README 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/README 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,4 +1,5 @@
WinPT - The Windows Privacy Tray
+ ================================
Note
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/ChangeLog 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,3 +1,25 @@
+2006-08-04 Timo Schulz <ts at g10code.de>
+
+ * wptKeysignDlg.cpp (display_keyinfo): Skip revoked user IDs.
+ * wptKeyManagerDlg.cpp (reload_keylist): Use updated ptr.
+ * wptKeyCache.cpp (gpg_keycache_delete_key): Correct handling
+ for the situation that the last key in the cache is deleted.
+ * wptFileManagerDlg.cpp (update_ui_items): Fix file name
+ detection.
+
+2006-08-02 Timo Schulz <ts at g10code.de>
+
+ * wptClipDecryptDlg.cpp (verify_get_clip_info): Fix problem
+ with static data.
+ (clip_decrypt_dlg_proc): Prefix keyid with 0x.
+ (get_key_userid): Fix problem when key was not found.
+ * wptClipVerifyDlg.cpp (fetch_key_from_keyserver): Correct
+ fingerprint to short keyid conversion.
+ * wptVerifyList.cpp (verlist_set_additional_info): Handle bad
+ sigs.
+ * wptKeyManagerDlg.cpp (update_status_bar): Faster update code.
+
+
2006-08-01 Timo Schulz <ts at g10code.de>
* wptGPG.cpp (get_last_gnupg_access): Enhanced.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/WinPT-en.rc 2006-08-05 10:31:06 UTC (rev 256)
@@ -694,7 +694,7 @@
COMBOBOX IDC_PREFS_DEFEXT,155,40,76,47,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Backup includes secret keyring",IDC_PREFS_BAKSECRING,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,241,144,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,241,164,10
END
IDD_WINPT_HKPSEARCH DIALOG DISCARDABLE 0, 0, 359, 157
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -51,17 +51,19 @@
get_key_userid (const char *keyid)
{
winpt_key_s key;
- const char *fmt;
+ const char *fmt, *userid;
char *uid;
+ fmt = "\n \"%s\"";
memset (&key, 0, sizeof (key));
if (winpt_get_pubkey (keyid, &key))
- return m_strdup (_("user ID not found"));
- fmt = "\n \"%s\"";
- uid = new char[strlen (key.ext->uids->uid) + strlen (fmt)+ 2];
+ userid = (_("user ID not found"));
+ else
+ userid = key.ext->uids->uid;
+ uid = new char[strlen (userid) + strlen (fmt)+ 2];
if (!uid)
BUG (NULL);
- sprintf (uid, fmt, key.ext->uids->uid);
+ sprintf (uid, fmt, userid);
winpt_release_pubkey (&key);
return uid;
}
@@ -129,14 +131,14 @@
"*** Signer: %s (0x%s)\r\n"
"*** BEGIN PGP DECRYPTED TEXT ***\r\n");
const char *foot = _("\r\n*** END PGP DECRYPTED TEXT ***");
- const char *s, *made, *ver, *ot;
- char *p;
+ const char *s, *ver, *ot;
+ char *p, *made;
if (winpt_get_pubkey (sig->fpr, &pk))
BUG (0);
ot = verify_get_key_ownertrust (pk.ctx->owner_trust, NULL);
- made = strtimestamp (sig->timestamp);
+ made = m_strdup (strtimestamp (sig->timestamp));
ver = strtimestamp (time (NULL));
s = get_gpg_sigstat (sig->summary);
p = new char[strlen (head) + strlen (s) + strlen (made) +
@@ -148,6 +150,7 @@
pk.ext->uids->uid, get_keyid_from_fpr (sig->fpr));
*r_header = p;
*r_footer = m_strdup (foot);
+ free_if_alloc (made);
}
@@ -231,7 +234,7 @@
gpgme_recipient_t r = res->recipients;
char *u = get_key_userid (r->keyid+8);
log_box (_("Decryption"), MB_ERR,
- _("Encrypted with %s key, ID %s.%s\n"
+ _("Encrypted with %s key, ID 0x%s.%s\n"
"Decryption failed: secret key not available."),
get_key_pubalgo (r->pubkey_algo), r->keyid+8, u);
free_if_alloc (u);
Modified: trunk/Src/wptClipEncryptDlg.cpp
===================================================================
--- trunk/Src/wptClipEncryptDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptClipEncryptDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -49,6 +49,7 @@
gpg_clip_encrypt (gpgme_key_t rset[], int always_trust, gpgme_ctx_t *r_ctx)
{
gpgme_error_t err;
+ gpgme_encrypt_flags_t flags;
gpgme_ctx_t ctx = NULL;
gpgme_data_t plain = NULL;
gpgme_data_t ciph = NULL;
@@ -66,9 +67,8 @@
err = gpgme_data_new (&ciph);
if (err)
goto leave;
- err = gpgme_op_encrypt (ctx, rset,
- always_trust?GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0,
- plain, ciph);
+ flags = always_trust? GPGME_ENCRYPT_ALWAYS_TRUST : (gpgme_encrypt_flags_t)0;
+ err = gpgme_op_encrypt (ctx, rset, flags, plain, ciph);
*r_ctx = ctx;
if (err)
goto leave;
@@ -147,6 +147,7 @@
gpgme_key_t *rset;
gpgme_ctx_t ctx=NULL;
gpgme_error_t err;
+ char tmpbuf[64];
int force_trust = 0;
int n;
@@ -175,7 +176,7 @@
notify = (NMHDR *)lparam;
if (notify && notify->code == NM_DBLCLK &&
notify->idFrom == IDC_ENCRYPT_KEYLIST)
- PostMessage( dlg, WM_COMMAND, MAKEWPARAM( IDOK, 0 ), 0 );
+ PostMessage( dlg, WM_COMMAND, MAKEWPARAM (IDOK, 0), 0);
if (notify && notify->code == LVN_COLUMNCLICK &&
notify->idFrom == IDC_ENCRYPT_KEYLIST) {
NMLISTVIEW *p = (LPNMLISTVIEW) lparam;
@@ -225,22 +226,19 @@
return FALSE;
case IDC_ENCRYPT_FNDCMD:
- {
- char tmpbuf[64];
-
n = GetDlgItemText (dlg, IDC_ENCRYPT_FIND, tmpbuf, DIM (tmpbuf)-1);
if (!n)
break;
n = listview_find (lv, tmpbuf, 0);
- if (n != -1) {
+ if (n != -1) {
int oldpos = listview_get_curr_pos (lv);
listview_select_one (lv, n);
listview_scroll (lv, oldpos, n);
}
else
- log_box (_("Encryption"), MB_ERR, _("No recipient found with '%s'"), tmpbuf);
+ log_box (_("Encryption"), MB_ERR,
+ _("No recipient found with '%s'"), tmpbuf);
break;
- }
}
break;
}
Modified: trunk/Src/wptClipSignDlg.cpp
===================================================================
--- trunk/Src/wptClipSignDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptClipSignDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,5 @@
/* wptClipSignDlg.cpp - WinPT clipboard sign dialog
- * Copyright (C) 2000, 2001, 2002, 2003, 2005 Timo Schulz
+ * Copyright (C) 2000-2006 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
* This file is part of WinPT.
@@ -57,11 +57,9 @@
return gpg_error (GPG_ERR_INV_ARG);
gpgme_set_armor (ctx, 1);
-
err = gpg_data_new_from_clipboard (&plain, wraplen);
if (err)
return err;
-
err = get_pubkey (keyid, &key);
if (err)
goto leave;
@@ -70,7 +68,7 @@
goto leave;
err = gpgme_data_new (&sig);
if (err)
- goto leave;
+ goto leave;
err = gpgme_op_sign (ctx, plain, sig, GPGME_SIG_MODE_CLEAR);
if (err)
goto leave;
@@ -91,11 +89,11 @@
it doesn't make sense to offer a dialog for this case. */
void
one_key_proc (HWND dlg)
-{
- char *signer;
+{
gpgme_ctx_t ctx;
gpgme_error_t err;
passphrase_cb_s pwd;
+ char *signer;
int n = reg_prefs.word_wrap;
signer = get_gnupg_default_key ();
@@ -253,7 +251,7 @@
free_if_alloc (signer);
release_gpg_passphrase_cb (&pwd);
- if (pwd.cancel && gpgme_err_code(err) == GPG_ERR_BAD_PASSPHRASE) {
+ if (pwd.cancel && gpgme_err_code (err) == GPG_ERR_BAD_PASSPHRASE) {
/* The user hit the cancel button or bad passphrase */
gpgme_release (ctx);
return TRUE;
Modified: trunk/Src/wptClipVerifyDlg.cpp
===================================================================
--- trunk/Src/wptClipVerifyDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptClipVerifyDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,5 @@
/* wptClipVerifyDlg.cpp - WinPT verify dialog
- * Copyright (C) 2001-2005 Timo Schulz
+ * Copyright (C) 2001-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -37,7 +37,7 @@
#include "wptErrors.h"
#include "wptVersion.h"
-/* XXX use out directly and do not use gpg_data_extract to store the plain text. */
+/* XXX use @out directly and do not use gpg_data_extract to store the plain text. */
/* Verify data from the clipboard. If @is_detached is set, a detached
@@ -73,7 +73,6 @@
err = gpgme_data_new (&out);
if (err)
goto leave;
-
err = gpgme_op_verify (ctx, sig, dat, out);
if (err)
goto leave;
@@ -99,7 +98,7 @@
}
-/* Display the policy URL and the notation data of a signature. */
+/* Display the policy URL and/or the notation data of a signature. */
static void
show_notation_data (HWND dlg, gpgme_ctx_t ctx)
{
@@ -147,8 +146,6 @@
fetch_key_from_keyserver (HWND dlg, gpgme_signature_t sig)
{
const char *keyid;
- const char *kserv;
- WORD port;
int id;
if (!sig->fpr)
@@ -166,14 +163,12 @@
return FALSE;
}
- kserv = default_keyserver;
- port = default_keyserver_port;
-
/* XXX: gpgme currently does not include to return the preferred
keyserver that might be stored within the signature. */
- if (!hkp_recv_key (dlg, kserv, port, keyid+8, 0, 0))
- keycache_update (0, keyid+8);
+ if (!hkp_recv_key (dlg, default_keyserver, default_keyserver_port,
+ keyid, 0, 0))
+ keycache_update (0, keyid);
return TRUE;
}
@@ -278,4 +273,3 @@
return FALSE;
}
-
Modified: trunk/Src/wptDateDlg.cpp
===================================================================
--- trunk/Src/wptDateDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptDateDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,5 @@
/* wptDateDlg.cpp - Universal dialog to ask for a date
- * Copyright (C) 2001, 2002, 2003 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -17,7 +17,6 @@
* 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
@@ -33,7 +32,7 @@
#include "wptTypes.h"
-/* (common) Dialog box procedure to select a date. */
+/* Dialog box procedure to select a date. */
BOOL CALLBACK
date_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
@@ -42,26 +41,24 @@
switch( msg ) {
case WM_INITDIALOG:
udd = (date_s *)lparam;
- if( udd == NULL )
- dlg_fatal_error( dlg, "Can't get dialog param" );
- if( udd->text )
- SetWindowText( dlg, udd->text );
- SetForegroundWindow( dlg );
- return TRUE;
+ if (!udd)
+ BUG (0);
+ if (udd->text)
+ SetWindowText (dlg, udd->text);
+ SetForegroundWindow (dlg);
+ return TRUE;
- case WM_SYSCOMMAND:
- if( LOWORD( wparam ) == SC_CLOSE ) {
- udd->cancel = 1;
- EndDialog( dlg, TRUE );
- }
- return FALSE;
-
case WM_COMMAND:
- switch( LOWORD( wparam) ) {
+ switch (LOWORD (wparam)) {
+ case IDCANCEL:
+ udd->cancel = 1;
+ EndDialog (dlg, FALSE);
+ return TRUE;
+
case IDOK:
- DateTime_GetSystemtime( GetDlgItem( dlg, IDC_DATE_DTP ), &udd->st );
+ DateTime_GetSystemtime (GetDlgItem (dlg, IDC_DATE_DTP), &udd->st);
udd->cancel = 0;
- EndDialog( dlg, TRUE );
+ EndDialog (dlg, TRUE);
return TRUE;
}
break;
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptFileManager.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1387,14 +1387,14 @@
res = gpgme_op_decrypt_result (ctx);
if (res && res->recipients && !is_seckey_available (res->recipients)) {
- const char *keyid = res->recipients->keyid;
- char *p = get_key_userid (keyid+8);
+ const char *keyid = get_keyid_from_fpr (res->recipients->keyid);
+ char *p = get_key_userid (keyid);
gpgme_pubkey_algo_t pkalgo = res->recipients->pubkey_algo;
log_box (_("Decryption"), MB_ERR,
- _("Encrypted with %s key, ID %s.%s\n"
+ _("Encrypted with %s key, ID 0x%s.%s\n"
"Decryption failed: secret key not available."),
- get_key_pubalgo (pkalgo), keyid+8, p);
+ get_key_pubalgo (pkalgo), keyid, p);
rc = WPTERR_GENERAL;
free_if_alloc (p);
goto leave;
@@ -1519,8 +1519,8 @@
log->user_id = key.ext->uids->uid;
log->use_uid = 1;
}
- winpt_release_pubkey (&key);
file_verify_add_state (log);
+ winpt_release_pubkey (&key);
}
@@ -1910,7 +1910,8 @@
return WPTERR_GENERAL;
for (i=0; i < nitems; i++) {
- char name[300];
+ char name[MAX_PATH+32];
+
if (!listview_get_item_state (lv, i))
continue;
if (idx == -1)
@@ -1932,7 +1933,7 @@
fm_set_status (lv, idx, FM_ENCRYPT, (gpgme_sig_mode_t)0, 1, out_enc);
free_if_alloc (out_enc);
- for (i=0; i < nitems; i++) {
+ for (i=nitems; i > -1; i--) {
if (i != idx && listview_get_item_state (lv, i))
listview_del_item (lv, i);
}
@@ -1942,10 +1943,10 @@
int
fm_encrypt_directory (fm_state_t c, const char *name)
-{
- PK_FILE_LIST list = NULL;
+{
WIN32_FIND_DATA findbuf;
HANDLE hd;
+ PK_FILE_LIST list = NULL;
const char *s;
char *patt = NULL, *p;
int rc = 0;
@@ -1967,16 +1968,16 @@
pk_list_add (&list, p);
free_if_alloc (p);
}
- while( FindNextFile( hd, &findbuf ) ) {
- if( strcmp( findbuf.cFileName, "." ) && strcmp( findbuf.cFileName, ".." ) ) {
- p = make_filename( name, findbuf.cFileName, NULL );
- pk_list_add( &list, p );
- free_if_alloc( p );
+ while (FindNextFile (hd, &findbuf)) {
+ if (strcmp (findbuf.cFileName, ".") && strcmp (findbuf.cFileName, "..")) {
+ p = make_filename (name, findbuf.cFileName, NULL);
+ pk_list_add (&list, p);
+ free_if_alloc (p);
}
}
s = get_filesave_dlg (c->dlg, _("Choose a Name for the Archive"),
NULL, default_dirname (name));
- if( !s ) {
+ if (!s) {
msg_box (c->dlg, _("Invalid archive name. Exit."),
_("Encrypt Directory"), MB_ERR);
rc = -1;
@@ -1984,7 +1985,7 @@
}
rc = pk_archiv_create (list, s);
- if( rc )
+ if (rc)
msg_box (c->dlg, _("Could not create zip archive."),
_("Encrypt Directory"), MB_ERR);
else {
@@ -2057,11 +2058,11 @@
int
fm_send_file (listview_ctrl_t lv)
{
- char buf[128];
+ char name[128];
int rc;
- rc = listview_get_item_text (lv, -1, 1, buf, sizeof (buf)-1);
+ rc = listview_get_item_text (lv, -1, FM_COL_NAME, name, sizeof (name)-1);
if (rc != -1)
- mapi_send_ascfile (buf);
+ mapi_send_ascfile (name);
return 0;
}
Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptFileManagerDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -86,7 +86,7 @@
case WM_INITDIALOG:
c = (fm_state_t)lparam;
if (!c)
- dlg_fatal_error( dlg, "Could not get dialog state!" );
+ BUG (0);
kc = keycache_get_ctx (KEYCACHE_PUB);
SetWindowText (dlg, _("File Encrypt"));
SetDlgItemText (dlg, IDC_ENCRYPT_ARMOR, _("&Text Output"));
@@ -134,14 +134,8 @@
}
keylist_sort (lv, sortby);
}
+ break;
- case WM_SYSCOMMAND:
- if (LOWORD (wparam) == SC_CLOSE) {
- c->cancel = 1;
- EndDialog (dlg, TRUE);
- }
- return FALSE;
-
case WM_COMMAND:
if (HIWORD (wparam) == BN_CLICKED
&& LOWORD (wparam) == IDC_ENCRYPT_SIGN) {
@@ -149,7 +143,7 @@
EnableWindow (GetDlgItem (dlg, IDC_ENCRYPT_SECLIST),
req_signer? TRUE : FALSE);
}
- switch( LOWORD( wparam ) ) {
+ switch (LOWORD (wparam)) {
case IDOK:
ctx = c->ctx;
safe_free (c->recp);
@@ -207,8 +201,8 @@
case WM_INITDIALOG:
c = (fm_state_s *)lparam;
if (!c)
- dlg_fatal_error( dlg, "Could not get dialog param!" );
- ShowWindow (GetDlgItem( dlg, IDC_IMPORT_KEYMNGT ), WS_DISABLED);
+ BUG (0);
+ ShowWindow (GetDlgItem (dlg, IDC_IMPORT_KEYMNGT), WS_DISABLED);
implist_build (&lv, GetDlgItem (dlg, IDC_IMPORT_KEYLIST));
implist_load (lv, c->import.is_clip? NULL: c->opaque,
&is_revcert, &has_seckeys);
@@ -216,6 +210,7 @@
msg_box (dlg, _("No valid OpenPGP data found."), _("Key Import"), MB_ERR);
c->cancel = 1;
EndDialog (dlg, FALSE);
+ return TRUE;
}
else {
const char *s = _("%s contain(s) %d key(s).");
@@ -258,7 +253,7 @@
case IDCANCEL:
c->cancel = 1;
EndDialog (dlg, FALSE);
- return FALSE;
+ return TRUE;
}
break;
}
@@ -281,8 +276,8 @@
switch (msg) {
case WM_INITDIALOG:
c = (fm_state_s *)lparam;
- if (c == NULL)
- dlg_fatal_error (dlg, "Could not get dialog state!");
+ if (!c)
+ BUG (0);
SetWindowText (dlg, _("File Sign"));
SetDlgItemText (dlg, IDC_FILE_SIG_ARMOR, _("&Text Output") );
SetDlgItemText (dlg, IDC_FILE_SIG_NORMAL, _("&Normal Signature"));
@@ -310,11 +305,6 @@
}
return FALSE;
- case WM_SYSCOMMAND:
- if (LOWORD (wparam) == SC_CLOSE)
- EndDialog (dlg, TRUE);
- return FALSE;
-
case WM_COMMAND:
switch (LOWORD (wparam)) {
case IDOK:
@@ -339,23 +329,21 @@
return FALSE;
}
}
- listview_get_item_text( lv, lv_idx, 1, signer, sizeof signer-1 );
- if( get_seckey( signer, &key ) )
- BUG( NULL );
+ listview_get_item_text (lv, lv_idx, 1, signer, sizeof (signer)-1);
+ if (get_seckey (signer, &key))
+ BUG (NULL);
gpgme_signers_clear (c->ctx);
gpgme_signers_add (c->ctx, key);
free_if_alloc (c->opaque);
c->opaque = m_strdup (signer); /* store for later use */
c->cancel = 0;
- if (!c->opaque)
- BUG (0);
EndDialog (dlg, TRUE);
return TRUE;
case IDCANCEL:
c->cancel = 1;
EndDialog (dlg, FALSE);
- return FALSE;
+ return TRUE;
}
break;
}
@@ -427,10 +415,12 @@
static BOOL CALLBACK
filelist_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
+ int virt_key;
+
switch (msg) {
- case WM_KEYUP:
- int virt_key = (int)wparam;
- if (virt_key == VK_DELETE)
+ case WM_KEYUP:
+ virt_key = (int)wparam;
+ if (virt_key == VK_DELETE)
send_cmd_id (filelist_proc.dlg, ID_FILEMISC_WIPE);
break;
}
@@ -463,12 +453,16 @@
if (fm_check_file_type (lv, pos, FM_ENCRYPT)) {
set_menu_state (hm, ids[idx][DECRYPT], MF_GRAYED|MF_DISABLED);
set_menu_state (hm, ids[idx][VERIFY], MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ids[idx][ENCR], MF_ENABLED);
+ set_menu_state (hm, ids[idx][SIGN], MF_ENABLED);
+ set_menu_state (hm, ids[idx][SIGENC], MF_ENABLED);
}
if (fm_check_file_type (lv, pos, FM_DECRYPT)) {
set_menu_state (hm, ids[idx][ENCR], MF_GRAYED|MF_DISABLED);
set_menu_state (hm, ids[idx][ENCRZIP], MF_GRAYED|MF_DISABLED);
set_menu_state (hm, ids[idx][SIGN], MF_GRAYED|MF_DISABLED);
set_menu_state (hm, ids[idx][SIGENC], MF_GRAYED|MF_DISABLED);
+ set_menu_state (hm, ids[idx][DECRYPT], MF_ENABLED);
}
if (fm_check_file_type (lv, pos, FM_VERIFY)) {
set_menu_state (hm, ids[idx][VERIFY], MF_ENABLED);
@@ -541,7 +535,6 @@
set_menu_state (fm->menu, ID_FILEMISC_ONTOP, MFS_UNCHECKED);
else
center_window2 (dlg, NULL, HWND_TOPMOST);
-
center_window (dlg, NULL);
SetForegroundWindow (dlg);
fm->statbar = setup_status_bar (dlg);
@@ -809,14 +802,14 @@
/* Wipe callback. @ctx is a window handle @off is the current offset
- and @n is the total size. */
+ and @total is the total size. */
static void
-wipe_cb (void *ctx, ui64 off, ui64 n)
+wipe_cb (void *ctx, ui64 off, ui64 total)
{
SendDlgItemMessage ((HWND)ctx, IDC_SPACE_PROGRESS, PBM_SETPOS,
- (WPARAM) (off*100/n), 0);
+ (WPARAM) (off*100/total), 0);
SetDlgItemInt ((HWND)ctx, IDC_SPACE_OFF, (UINT)(off/1024), FALSE);
- SetDlgItemInt ((HWND)ctx, IDC_SPACE_N, (UINT)(n/1024), FALSE);
+ SetDlgItemInt ((HWND)ctx, IDC_SPACE_N, (UINT)(total/1024), FALSE);
}
@@ -857,7 +850,7 @@
0, (LPARAM)(const char *)p);
}
SendDlgItemMessage (dlg, IDC_SPACE_DRIVES, CB_SETCURSEL, 0, 0);
-} /* fill_drive_combobox */
+}
static void
@@ -878,7 +871,7 @@
SetDlgItemText(dlg, IDC_SPACE_DISC_INFO, buf);
SetDlgItemInt (dlg, IDC_SPACE_OFF, 0, FALSE);
SetDlgItemInt (dlg, IDC_SPACE_N, 0, FALSE);
-} /* update_disc_stats */
+}
BOOL CALLBACK
@@ -942,4 +935,4 @@
}
return FALSE;
-} /* space_wipefrees_dlg_proc */
+}
Modified: trunk/Src/wptFileStatDlg.cpp
===================================================================
--- trunk/Src/wptFileStatDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptFileStatDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -35,7 +35,7 @@
#include "wptUTF8.h"
#include "openpgp.h"
-
+/* Return the date in locale format. */
const char*
get_fmt_date (long timest)
{
@@ -46,6 +46,7 @@
}
+/* Return humand readable public key algo. */
static const char*
get_pubkey_algo (int algo)
{
@@ -59,6 +60,7 @@
}
+/* Return human readable symmetric algo. */
const char*
get_symkey_algo (int algo)
{
@@ -79,6 +81,7 @@
}
+/* Return human readable hash algo. */
static const char*
get_digest_algo (int algo)
{
@@ -100,6 +103,7 @@
}
+/* Return human readable compress algo. */
static const char*
get_compress_algo (int algo)
{
@@ -114,6 +118,7 @@
}
+/* Return human string to key algo. */
static const char*
get_s2k_algo (int algo)
{
@@ -146,11 +151,11 @@
inp = gpg_iobuf_open (file);
if (!inp) {
- log_box (_("File Manager"), MB_ERR, "%s: %s", file,
+ log_box (_("File Manager"), MB_ERR, "%s: %s", file,
winpt_strerror (WPTERR_FILE_OPEN));
return -1;
}
- gpg_iobuf_ioctl( inp, 3, 1, NULL ); /* disable cache */
+ gpg_iobuf_ioctl (inp, 3, 1, NULL); /* disable cache */
if (gpg_use_armor_filter (inp)) {
memset (&afx, 0, sizeof (afx));
gpg_iobuf_push_filter (inp, gpg_armor_filter, &afx);
@@ -163,7 +168,7 @@
{PKT_pubkey_enc *enc = pkt->pkt.pubkey_enc; n++;
if (!enc)
break;
- _snprintf( inf, sizeof(inf)-1,
+ _snprintf (inf, sizeof(inf)-1,
"public key encryted packet: version %d, algo %s, keyid 0x%08X",
enc->version, get_pubkey_algo(enc->pubkey_algo), enc->keyid[1]);
listbox_add_string (list, inf);}
@@ -269,8 +274,7 @@
int n;
switch (msg) {
- case WM_INITDIALOG:
- SetWindowText (dlg, _("File Status"));
+ case WM_INITDIALOG:
file = (const char*)lparam;
if (!file)
BUG (0);
@@ -280,6 +284,7 @@
EndDialog (dlg, FALSE);
return TRUE;
}
+ SetWindowText (dlg, _("File Status"));
SetForegroundWindow (dlg);
break;
Modified: trunk/Src/wptFirstRunDlg.cpp
===================================================================
--- trunk/Src/wptFirstRunDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptFirstRunDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -39,7 +39,7 @@
int choice = 0;
switch (msg) {
case WM_INITDIALOG:
- CheckDlgButton( dlg, IDC_FIRST_KEYGEN, BST_CHECKED );
+ CheckDlgButton (dlg, IDC_FIRST_KEYGEN, BST_CHECKED);
SetDlgItemText (dlg, IDC_FIRST_KEYGEN,
_("&Generate a GnuPG key pair"));
SetDlgItemText (dlg, IDC_FIRST_IMPORT,
Modified: trunk/Src/wptGPGOptDlg.cpp
===================================================================
--- trunk/Src/wptGPGOptDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptGPGOptDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -34,11 +34,13 @@
#include "resource.h"
-/* Dialog box procedure for the GPG config file. */
+#define DEF_CFGSIZE 2048
+
+/* Dialog box procedure for manipulating the GPG config file. */
BOOL CALLBACK
gpgopt_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
-{
- int id, nbytes = 8192;
+{
+ int id, nbytes = DEF_CFGSIZE;
char t[4], *optbuf = NULL;
switch (msg) {
@@ -72,24 +74,24 @@
return FALSE;
}
optbuf[nbytes] = '\0';
- if( check_gnupg_options( optbuf, 1 ) ) {
- msg_box( dlg, _("File contains invalid GnuPG keywords!"), _("GPG Config"), MB_ERR );
- free_if_alloc( optbuf );
+ if (check_gnupg_options (optbuf, 1)) {
+ msg_box (dlg, _("File contains invalid GnuPG keywords!"), _("GPG Config"), MB_ERR);
+ free_if_alloc (optbuf);
return FALSE;
}
- if( set_gnupg_options( optbuf, strlen( optbuf ) ) ) {
- msg_box( dlg, _("Could not save GnuPG config file."), _("GPG Config"), MB_ERR );
- free_if_alloc( optbuf );
+ if (set_gnupg_options (optbuf, strlen (optbuf))) {
+ msg_box (dlg, _("Could not save GnuPG config file."), _("GPG Config"), MB_ERR);
+ free_if_alloc (optbuf);
return FALSE;
}
- msg_box( dlg, _("Successfully saved."), _("GPG Config"), MB_OK );
- free_if_alloc( optbuf );
+ msg_box (dlg, _("Successfully saved."), _("GPG Config"), MB_OK);
+ free_if_alloc (optbuf);
return TRUE;
case IDC_GPGOPT_LOAD:
- if( GetDlgItemText(dlg, IDC_GPGOPT_FILE, t, sizeof t - 1 ) ) {
- id = msg_box( dlg, _("Current data will be lost!\n"
- "Are you sure?"), _("GPG Config"), MB_INFO|MB_YESNO );
+ if (GetDlgItemText(dlg, IDC_GPGOPT_FILE, t, sizeof (t) - 1)) {
+ id = msg_box (dlg, _("Current data will be lost!\n"
+ "Are you sure?"), _("GPG Config"), MB_INFO|MB_YESNO);
if (id == IDNO)
return TRUE;
}
@@ -101,7 +103,7 @@
return TRUE;
case IDCANCEL:
- EndDialog( dlg, FALSE );
+ EndDialog (dlg, FALSE);
return FALSE;
}
break;
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -121,6 +121,8 @@
SetDlgItemText (dlg, IDC_GPGPREFS_LOCALE, p);
free_if_alloc (p);
}
+ /* if there is no 'HomeDir' registry value but an existing
+ GPG multipath, we use this as the home dir instead. */
if (!item_get_text_length (dlg, IDC_GPGPREFS_HOMEDIR)) {
p = multi_gnupg_path (0);
if (p && dir_exist_check (p) == 0)
@@ -232,9 +234,9 @@
_("Preferences"), MB_ERR);
return FALSE;
}
- if( !GetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR,
+ if (!GetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR,
exedir, sizeof (exedir) -1)) {
- msg_box (dlg, _("Please enter where GPG.exe is located."),
+ msg_box (dlg, _("Please enter where GPG.exe is located."),
_("Preferences"), MB_ERR);
return FALSE;
}
@@ -248,7 +250,7 @@
_("Preferences"), MB_ERR);
return FALSE;
}
- if (GetDlgItemText (dlg, IDC_GPGPREFS_LOCALE,
+ if (GetDlgItemText (dlg, IDC_GPGPREFS_LOCALE,
locale_dir, sizeof (locale_dir) -1) > 0) {
if (dir_exist_check (locale_dir)) {
log_box ( _("Preferences"), MB_ERR, "%s: %s", locale_dir,
@@ -321,17 +323,13 @@
SetDlgItemText (dlg, IDC_GPGPREFS_HOMEDIR, folder);
SendDlgItemMessage (dlg, IDC_GPGPREFS_HOMEDIR,
EM_SETMODIFY, (WPARAM)(UINT)TRUE, 0);
- if (GetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR,
+ if (GetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR,
exedir, DIM (exedir)-1) > 0)
break;
name = make_filename (folder, "gpg", "exe");
if (file_exist_check (name) == 0)
SetDlgItemText (dlg, IDC_GPGPREFS_EXEDIR, name);
free_if_alloc (name);
- name = make_filename (folder, "gpg", "conf");
- if (file_exist_check (name) == 0)
- SetDlgItemText (dlg, IDC_GPGPREFS_OPTFILE, name);
- free_if_alloc (name);
}
return TRUE;
Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyCache.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -762,11 +762,16 @@
return rc;
c = ctx->item;
- if (c->next == NULL) {
+ if (!c) /* empty */
+ return 0;
+ else if (c->next == NULL) {
if (itm->key)
gpgme_key_release (itm->key);
itm->key = NULL;
free_if_alloc (itm);
+ /* the cache has no other items, so we set the context to NULL
+ to indicate that the entire cache is empty. */
+ ctx->item = NULL;
}
else {
for (; c != NULL; c = c->next) {
Modified: trunk/Src/wptKeyEditOwnertrustDlg.cpp
===================================================================
--- trunk/Src/wptKeyEditOwnertrustDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyEditOwnertrustDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -94,11 +94,10 @@
ek = new GpgKeyEdit (k->keyid);
err = ek->setTrust ((gpgme_validity_t)index);
delete ek;
- if (err) {
+ if (err)
msg_box (dlg, gpgme_strerror (err), _("Ownertrust"), MB_ERR);
- return TRUE;
- }
- EndDialog (dlg, TRUE);
+ else
+ EndDialog (dlg, TRUE);
return TRUE;
}
break;
Modified: trunk/Src/wptKeyImportStatusDlg.cpp
===================================================================
--- trunk/Src/wptKeyImportStatusDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyImportStatusDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -38,13 +38,13 @@
BOOL CALLBACK
import_status_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
- static gpgme_import_result_t res;
+ gpgme_import_result_t res;
switch (msg) {
case WM_INITDIALOG:
res = (gpgme_import_result_t)lparam;
if (!res)
- dlg_fatal_error (dlg, "Could not get dialog param");
+ BUG (0);
SetDlgItemText (dlg, IDC_IMPSTAT_NPKEYSINF, _("Number of public keys"));
SetDlgItemText (dlg, IDC_IMPSTAT_IPKEYSINF, _("Imported public keys"));
SetDlgItemText (dlg, IDC_IMPSTAT_NSKEYSINF, _("Number of secret keys"));
@@ -68,11 +68,11 @@
SetDlgItemText (dlg, IDC_IMPSTAT_INFO, _("Revocation certifcate(s) imported."));
else if (res->secret_imported > 0)
SetDlgItemText (dlg, IDC_IMPSTAT_INFO, _("Secret key(s) imported."));
- else if(res->imported == 0
- && res->secret_imported == 0
- && res->new_user_ids == 0
- && res->new_sub_keys == 0
- && res->new_signatures == 0)
+ else if (res->imported == 0
+ && res->secret_imported == 0
+ && res->new_user_ids == 0
+ && res->new_sub_keys == 0
+ && res->new_signatures == 0)
SetDlgItemText (dlg, IDC_IMPSTAT_INFO, _("No keys updated."));
SetWindowText (dlg, _("Key Import Statistics"));
center_window (dlg, NULL);
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -522,13 +522,10 @@
char txt_sec[128];
char 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++;
- }
+ nsec = gpg_keycache_get_size (keycache_get_ctx (0));
+
_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);
@@ -1153,8 +1150,8 @@
{
gpg_keycache_t c;
- c = keycache_get_ctx (1);
keycache_reload (kmi->dlg);
+ c = keycache_get_ctx (1);
keylist_reload (kmi->lv, c, KEYLIST_LIST, kmi->keylist_sortby);
update_status_bar (kmi->statbar, kmi->lv);
keyring_check_last_access ();
Modified: trunk/Src/wptKeyPropsDlg.cpp
===================================================================
--- trunk/Src/wptKeyPropsDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyPropsDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,4 +1,4 @@
-/* wptKeyPropsDlg.cpp - WinPT key properties dialog
+/* wptKeyPropsDlg.cpp - WinPT key property dialog
* Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Timo Schulz
*
* This file is part of WinPT.
@@ -113,7 +113,7 @@
key_load_photo (HWND dlg, gpgme_key_t key, gpgme_validity_t *r_valid)
{
winpt_key_s k;
- FILE *f;
+ FILE *fp;
const BYTE *img;
DWORD imglen = 0;
int pos=0;
@@ -132,11 +132,11 @@
return -1;
}
- f = fopen (get_photo_tmpname (dlg), "wb");
- if (f) {
+ fp = fopen (get_photo_tmpname (dlg), "wb");
+ if (fp) {
pos += 16;
- fwrite (img + pos, 1, imglen - pos, f);
- fclose (f);
+ fwrite (img + pos, 1, imglen - pos, fp);
+ fclose (fp);
}
return 0;
}
@@ -175,6 +175,7 @@
case 8: return "AES192";
case 9: return "AES256";
case 10:return "Twofish";
+ default:break;
}
return "Unknown";
}
@@ -335,7 +336,7 @@
POINT p;
p.x = p.y = 0;
PTD_jpg_show (GetDlgItem (dlg, IDC_KEYPROPS_IMG),
- &p, get_photo_tmpname (dlg));
+ &p, get_photo_tmpname (dlg));
}
break;
Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyRevokeDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -148,7 +148,7 @@
switch (LOWORD (wparam)) {
case IDC_KEYREVOKE_CHOOSE:
const char *s;
- mk_cert_fname (k->keyid, file, sizeof file-1);
+ mk_cert_fname (k->keyid, file, sizeof (file)-1);
s = get_filesave_dlg (dlg, _("Choose File to save the Certificate"), NULL, file);
if (s && *s)
SetDlgItemText (dlg, IDC_KEYREVOKE_FILE, s);
@@ -202,7 +202,7 @@
case IDCANCEL:
EndDialog (dlg, FALSE);
- return FALSE;
+ return TRUE;
}
break;
}
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeygenDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -263,8 +263,6 @@
SetDlgItemText (dlg, IDC_KEYGEN_EMAIL, "");
SetDlgItemText (dlg, IDC_KEYGEN_COMMENT, "");
SetDlgItemText (dlg, IDC_KEYGEN_EXPDATE, "");
- SetDlgItemText (dlg, IDC_KEYGEN_PASSPHRASE, "");
- SetDlgItemText (dlg, IDC_KEYGEN_PWDCHECK, "");
}
@@ -465,7 +463,7 @@
}
pwd = request_passphrase2 (_("Key Generation"),
- PASSDLG_STRICT|PASSDLG_WARN_UTF8, &cancel);
+ PASSDLG_STRICT|PASSDLG_WARN_UTF8, &cancel);
if (cancel) {
sfree_if_alloc (pwd);
free_if_alloc (utf8_name);
@@ -606,7 +604,7 @@
backup_keyrings (dlg);
if (ctx)
- ctx->cancel = 0;
+ ctx->cancel = 0;
EndDialog (dlg, TRUE);
break;
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -142,6 +142,7 @@
s = _("Key(s) successfully received but nothing was changed.");
else
s = _("Key(s) sucessfully received and imported.");
+ // nice to have the amount of new signatures...
gpgme_data_write (msg, s, strlen (s));
gpgme_data_write (msg, "\n\n", 2);
@@ -151,7 +152,7 @@
gpgme_data_write (msg, s, strlen (s));
gpgme_data_write (msg, "\n", 1);
gpgme_key_release (key);
- free (uid);
+ safe_free (uid);
}
}
gpgme_data_write (msg, "\0", 1);
@@ -210,7 +211,7 @@
if (!strstr (rawkey, "BEGIN PGP PUBLIC KEY BLOCK")) {
msg_box (dlg, _("This is not a valid OpenPGP key."),
- _("Keyserver"), MB_ERR);
+ _("Keyserver"), MB_ERR);
goto leave;
}
if (gpgme_new (&ctx))
@@ -324,7 +325,8 @@
{
char buf[16];
- listview_get_item_text (lv, kserver_get_pos (lv), KS_COL_PORT, buf, 15);
+ listview_get_item_text (lv, kserver_get_pos (lv),
+ KS_COL_PORT, buf, sizeof (buf)-1);
return (WORD)strtoul (buf, NULL, 10);
}
@@ -332,7 +334,7 @@
static void
set_default_ks (listview_ctrl_t lv)
{
- char *p, buf[200];
+ char *p, buf[128];
int i;
p = get_reg_entry_keyserver ("Default");
@@ -340,7 +342,7 @@
return;
for (i=0; i < listview_count_items (lv, 0); i++) {
listview_get_item_text (lv, i, KS_COL_NAME, buf, sizeof (buf)-1);
- if (!stricmp (buf, p)) {
+ if (!stricmp (buf, p)) {
listview_select_one (lv, i);
break;
}
@@ -358,12 +360,13 @@
idx = listview_get_curr_pos (lv);
if (idx == -1) {
- msg_box (NULL, _("Please select one of the servers."), _("Keyserver"), MB_ERR);
+ msg_box (NULL, _("Please select one of the servers."),
+ _("Keyserver"), MB_ERR);
return -1;
}
listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);
if (strnicmp (buf, "http", 4) && strnicmp (buf, "hkp", 3)) {
- msg_box (NULL, _("Only HTTP keyserver can be used."),
+ msg_box (NULL, _("Only HKP keyserver can be used."),
_("Keyserver"), MB_ERR);
return -1;
}
@@ -394,7 +397,7 @@
for (j=0; keyserver[j].fieldname; j++)
listview_add_column (lv, &keyserver[j]);
listview_set_image_list (lv, 16, 16, ico, 1);
- for (j = 0; j<MAX_KEYSERVERS; j++) {
+ for (j = 0; j < MAX_KEYSERVERS; j++) {
if (!server[j].used)
continue;
listview_add_item_image (lv, " ", 0);
@@ -723,7 +726,7 @@
case IDC_KEYSERVER_DEFAULT:
save_default_ks (lv);
- break;
+ return TRUE;
case ID_KSERVCTX_ADD:
memset (&edit, 0, sizeof (edit));
@@ -761,7 +764,7 @@
case IDCANCEL:
EndDialog (dlg, FALSE);
- return FALSE;
+ return TRUE;
}
break;
}
Modified: trunk/Src/wptKeyserverSearchDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverSearchDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeyserverSearchDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -78,7 +78,8 @@
}
-
+/* Begin the key serach and add all results to the list view @lv.
+ Return value: 0 on success. */
static int
search_hkp_keys (HWND dlg, keyserver_ctx *ksc, listview_ctrl_t lv)
{
@@ -168,8 +169,8 @@
switch (msg) {
case WM_INITDIALOG:
ksc = (keyserver_ctx *)lparam;
- if (!ksc)
- dlg_fatal_error (dlg, "Could not get dialog param.");
+ if (!ksc)
+ BUG (0);
lv = on_init_dialog (dlg, msg, wparam, lparam);
if (search_hkp_keys (dlg, ksc, lv)) {
EndDialog (dlg, FALSE);
@@ -197,7 +198,7 @@
case IDCANCEL:
EndDialog (dlg, FALSE);
- return FALSE;
+ return TRUE;
case IDC_HKPSEARCH_RECV:
fetch_keys (dlg, lv, ksc);
Modified: trunk/Src/wptKeysigDlg.cpp
===================================================================
--- trunk/Src/wptKeysigDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeysigDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -207,7 +207,6 @@
if (ctx.expired)
CheckDlgButton (dlg, IDC_SIGPROPS_EXPIRED, BST_CHECKED);
}
- /* XXX (gpgme): \r at the end of the notation value. */
if (ks->notations && !ks->notations->name && ks->notations->value)
SetDlgItemText (dlg, IDC_SIGPROPS_POLIC, ks->notations->value);
@@ -498,7 +497,7 @@
switch (LOWORD (wparam)) {
case ID_SIGCTX_KEYPROPS:
do_load_keyprops (dlg, lv);
- break;
+ return TRUE;
case ID_SIGCTX_PROPS:
if (is_sig (lv, -1)) {
@@ -506,7 +505,7 @@
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_SIGPROPS, dlg,
sigprops_dlg_proc, (LPARAM)ks);
}
- break;
+ return TRUE;
case IDC_KEYSIG_RECVKEY:
idx = listview_get_curr_pos (lv);
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptKeysignDlg.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -301,7 +301,7 @@
gpgme_data_new (&kinf);
_snprintf (tmp, sizeof (tmp) -1,
- _("pub %d/0x%s created: %s expires: %s\n\n"
+ _("pub %d/0x%s created: %s expires: %s\n\n"
"Primary key fingerprint: %s\n\n"),
key->ctx->subkeys->length,
key->ctx->subkeys->keyid+8,
@@ -309,8 +309,10 @@
get_expire_date (key->ctx),
get_printable_fpr (key->ctx->subkeys->fpr));
gpgme_data_write (kinf, tmp, strlen (tmp));
- for (len=0, u = key->ext->uids; u; u = u->next, len++) {
- if (len > 2)
+ for (len=0, u = key->ext->uids; u; u = u->next) {
+ if (u->revoked)
+ continue;
+ if (len++ > 2)
break;
gpgme_data_write (kinf, "\t\"", 2);
gpgme_data_write (kinf, u->uid, strlen (u->uid));
Modified: trunk/Src/wptVerifyList.cpp
===================================================================
--- trunk/Src/wptVerifyList.cpp 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/Src/wptVerifyList.cpp 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,5 @@
/* wptVerifyList.cpp - Listview for verifying signatures
- * Copyright (C) 2001, 2002, 2003, 2005 Timo Schulz
+ * Copyright (C) 2001, 2002, 2003, 2005, 2006 Timo Schulz
* Copyright (C) 2005 g10 Code GmbH
*
* This file is part of WinPT.
@@ -125,12 +125,19 @@
if (!vlv->infctl)
return;
+ /* if the signature is bad, we just hide the window and return. */
+ if (sig->summary & GPGME_SIGSUM_RED) {
+ ShowWindow (vlv->infctl, SW_HIDE);
+ return;
+ }
+
if (sig->exp_timestamp > (DWORD)time (NULL))
SendMessage (vlv->infctl, WM_SETTEXT, 0, (LPARAM)(char*)
_("The signature is expired!"));
else if (sig->validity != GPGME_VALIDITY_MARGINAL &&
sig->validity != GPGME_VALIDITY_FULL &&
- sig->validity != GPGME_VALIDITY_ULTIMATE) {
+ sig->validity != GPGME_VALIDITY_ULTIMATE &&
+ !(sig->summary & GPGME_SIGSUM_KEY_MISSING)) {
SendMessage (vlv->infctl, WM_SETTEXT, 0, (LPARAM)(char*)
_("WARNING: This key is not certified with a trusted signature!\r\n"
" There is no indication that the signature belongs to the owner.\r\n"));
@@ -159,11 +166,11 @@
{
struct listview_column_s verlist[] = {
{0, 120, (char *)_("Name")},
- {1, 140, (char *)_("Status") },
- {2, 120, (char *)_("Signed") },
+ {1, 140, (char *)_("Status")},
+ {2, 120, (char *)_("Signed")},
{3, 58, (char *)_("Trust") },
{4, 80, (char *)_("Key ID" )},
- {5, 160, (char *)_("User ID") },
+ {5, 160, (char *)_("User ID")},
{6, 0, NULL}
};
HICON ico[2];
@@ -211,10 +218,10 @@
verlist_add_sig (verlist_ctrl_t vlv, gpgme_signature_t sig)
{
listview_ctrl_t lv;
- struct winpt_key_s key;
- u32 key_attr;
+ struct winpt_key_s key;
const char *attr;
char keyid[32+1];
+ u32 key_attr;
int is_bad;
is_bad = sig->summary & GPGME_SIGSUM_RED? 1 : 0;
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/THANKS 2006-08-05 10:31:06 UTC (rev 256)
@@ -52,6 +52,7 @@
Marcus Junk Marcus.Junk at bkk-der-partner.de
Markus Spehling
Markus Winkelmann mwinkelmann at ofi-ag.ch
+Martin Lukac
Michael Daigle mdaigle at canada.com
Michael Roth mroth at gnupg.org
Nicolas Robaux nicolas at robaux.com
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/TODO 2006-08-05 10:31:06 UTC (rev 256)
@@ -3,14 +3,11 @@
MUST items before we can release 1.0.0
=======================================
-# check all dialog for consistent handling
-
Finally, we are close to release 1.0.0. Make a feature freeze,
fix all serious tracker items and do intensive tests.
* set imported private keys automatically to "ultimate" ownertrust?
- + check native language support with non-admin accounts.
* there is a problem with the +E hotkey in EURO countries.
- migrate keyserver code to use the HTTP class.
Implement proxy authentication into the HTTP class.
@@ -32,9 +29,6 @@
* CARD
- sign/decrypt
- factor out some common code into wptCardManager.cpp
- * Winpt should take care for a multi user environment.
- (partly done via %foo% registry support)
- - Use accelators for some dialogs to support 'hotkeys'.
- Move the both managers (key/file) to separate applications
and use MFC control elemens for the treelist element.
* Implement the non-swapable memory for passphrase handling.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-08-01 16:37:23 UTC (rev 255)
+++ trunk/configure.ac 2006-08-05 10:31:06 UTC (rev 256)
@@ -1,5 +1,5 @@
# configure.ac - for WinPT
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -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, 1.0.0pre2, http://www.winpt.org)
+AC_INIT(WinPT, 1.0.0pre3, http://www.winpt.org)
NEED_GPG_VERSION=1.4.2
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.1
@@ -73,7 +73,7 @@
of the header files. For now we require at least Internet Exploder
4.01 to be installed. */
#include <w32api.h>
-#define _WIN32_IE IE401
+#define _WIN32_IE IE55
])
AM_MAINTAINER_MODE
More information about the Winpt-commits
mailing list