[Winpt-commits] r248 - in trunk: . Doc/website PTD Po Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jul 28 13:11:19 CEST 2006
Author: twoaday
Date: 2006-07-28 13:11:09 +0200 (Fri, 28 Jul 2006)
New Revision: 248
Added:
trunk/PTD/wptDNSKeys.cpp
Modified:
trunk/Doc/website/download.html
trunk/Doc/website/index.html
trunk/PTD/ChangeLog
trunk/PTD/Makefile.am
trunk/PTD/PTD.cpp
trunk/Po/ChangeLog
trunk/Po/de.po
trunk/Po/jp.po
trunk/Po/pt_BR.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/WinPT.cpp
trunk/Src/resource.h
trunk/Src/wptCardDlg.cpp
trunk/Src/wptClipDecryptDlg.cpp
trunk/Src/wptClipEditDlg.cpp
trunk/Src/wptErrors.cpp
trunk/Src/wptFileManager.cpp
trunk/Src/wptGPG.cpp
trunk/Src/wptGPGOptDlg.cpp
trunk/Src/wptImportList.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyEditOwnertrustDlg.cpp
trunk/Src/wptKeyManager.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptKeyRevokeDlg.cpp
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptKeylist.cpp
trunk/Src/wptKeyserver.cpp
trunk/Src/wptKeyserverDlg.cpp
trunk/Src/wptKeysignDlg.cpp
trunk/Src/wptMAPI.cpp
trunk/Src/wptMainProc.cpp
trunk/Src/wptPassphraseDlg.cpp
trunk/Src/wptPreferencesDlg.cpp
trunk/Src/wptSigTreeDlg.cpp
trunk/Src/wptW32API.cpp
trunk/THANKS
trunk/TODO
Log:
Prepare 1.0.0pre2 release.
Modified: trunk/Doc/website/download.html
===================================================================
--- trunk/Doc/website/download.html 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Doc/website/download.html 2006-07-28 11:11:09 UTC (rev 248)
@@ -53,17 +53,17 @@
</p> </td>
<td width="710" align="left" valign="top">
<p class="style2">Remember that you need GnuPG installed on your computer to use WinPT. You can get GnuPG for free from the <a href="http://www.gnupg.org" target="_blank">GnuPG website</a>. </p>
- <p class="style4">The latest version of WinPT is 1.0.0pre1.</p>
+ <p class="style4">The latest version of WinPT is 1.0.0pre2.</p>
<p class="style2">
- Latest <b>binary</b> version: <a href="http://wald.intevation.org/frs/download.php/139/winpt-1.0.0pre1-exe.zip">download</a>
- <a href="http://wald.intevation.org/frs/download.php/140/winpt-1.0.0pre1-exe.zip.sig">signature</a>
- <br>sha1sum: <tt>6543d03805201708298a8d4d6f448452ef61f8fb</tt>
+ Latest <b>binary</b> version: <a href="http://wald.intevation.org/frs/download.php/139/winpt-1.0.0pre2-exe.zip">download</a>
+ <a href="http://wald.intevation.org/frs/download.php/140/winpt-1.0.0pre2-exe.zip.sig">signature</a>
+ <br>sha1sum: <tt>c281dbb14ae2eddd176e7814464094a3e3defc05</tt>
</p>
- <p class="style2"><b>Source</b> code: <a href="http://wald.intevation.org/frs/download.php/137/winpt-1.0.0pre1.tar.bz2">download</a>
- <a href="http://wald.intevation.org/frs/download.php/138/winpt-1.0.0pre1.tar.bz2.sig">signature</a>
- <br>sha1sum: <tt>1bec44790e1c87869972c6986f41a2e73af83212</tt>
+ <p class="style2"><b>Source</b> code: <a href="http://wald.intevation.org/frs/download.php/137/winpt-1.0.0pre2.tar.bz2">download</a>
+ <a href="http://wald.intevation.org/frs/download.php/138/winpt-1.0.0pre2.tar.bz2.sig">signature</a>
+ <br>sha1sum: <tt>98a2e1cc17d19bf7512c7cc8c6ad6d7bd30563ef</tt>
</p>
<!-- uncomment this only if we need a special gpg version
@@ -77,8 +77,8 @@
<p class="style2">
A graphical <b>installer</b> with WinPT and GnuPG bundled together (<a href="http://www.gpg4win.org">Gpg4Win<a/>)
<br>
- Lastest version: <a href="http://ftp.gpg4win.org/gpg4win-1.0.3.exe">download</a>
- <a href="http://ftp.gpg4win.org/gpg4win-1.0.3.exe.sig">signature</a><br/>
+ Lastest version: <a href="http://ftp.gpg4win.org/gpg4win-1.0.4.exe">download</a>
+ <a href="http://ftp.gpg4win.org/gpg4win-1.0.4.exe.sig">signature</a><br/>
</p>
<p class="style2">Download OpenPGP <a href="twoaday.asc">keys</a> used for signing the released files </p>
Modified: trunk/Doc/website/index.html
===================================================================
--- trunk/Doc/website/index.html 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Doc/website/index.html 2006-07-28 11:11:09 UTC (rev 248)
@@ -6,7 +6,7 @@
<!-- original author: Shane M. Coughlan -->
-<title>WinPT</title>
+<title>Windows Privacy Tray - WinPT</title>
<style type="text/css">
<!--
.style1 {
@@ -65,7 +65,7 @@
<p class="style2">
WinPT is designed to make life easier for people who want encryption, and to make security less
daunting for people who are new to securing data. </p>
- <p class="style4">The latest version of WinPT is 1.0.0pre1. You can download it from <a href="download.html">here</a>.</p>
+ <p class="style4">The latest version of WinPT is 1.0.0pre2. You can download it from <a href="download.html">here</a>.</p>
<p class="style3">
WinPT is licensed under the GNU GPL, and can be freely used, redistributed or modified.
It is is distributed in the hope that it will be useful,
Modified: trunk/PTD/ChangeLog
===================================================================
--- trunk/PTD/ChangeLog 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/PTD/ChangeLog 2006-07-28 11:11:09 UTC (rev 248)
@@ -1,3 +1,7 @@
+2006-07-25 Timo Schulz <ts at g10code.de>
+
+ * wptDNSKeys.cpp: New.
+
2006-06-22 Timo Schulz <ts at g10code.de>
* resource.rc: Includes versioninfo.rc to build the
Modified: trunk/PTD/Makefile.am
===================================================================
--- trunk/PTD/Makefile.am 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/PTD/Makefile.am 2006-07-28 11:11:09 UTC (rev 248)
@@ -30,10 +30,11 @@
wptFileDisk.cpp \
wptZIP.cpp wptZIP.h \
wptJPG.cpp wptJPG.h \
- wptWipeFile.cpp
+ wptWipeFile.cpp \
+ wptDNSKeys.cpp
PTD_LDADD = $(srcdir)/PTD.def -L../Gnupg -lgnupg $(W32LIBS) \
- -lole32 -loleaut32 -luuid -lgdi32
+ -lole32 -loleaut32 -lgdi32 -luuid
resource.o: resource.rc resource.h versioninfo.rc
Modified: trunk/PTD/PTD.cpp
===================================================================
--- trunk/PTD/PTD.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/PTD/PTD.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -1,5 +1,5 @@
/* PTD.cpp - Privacy Tray Dynamic
- * Copyright (C) 2002-2005 Timo Schulz
+ * Copyright (C) 2002-2006 Timo Schulz
*
* This file is part of WinPT.
*
@@ -60,6 +60,9 @@
static HHOOK journ_hook = NULL; /* Journaling hook handle. */
+void dns_cleanup (void);
+
+
static LRESULT CALLBACK
PTD_CBT_proc (int code, WPARAM wparam, LPARAM lparam)
{
@@ -143,6 +146,7 @@
{
if (!cbt_hook)
return;
+ dns_cleanup ();
UnhookWindowsHookEx (cbt_hook);
cbt_hook = NULL;
shell_traywnd = NULL;
@@ -190,7 +194,7 @@
}
return CallNextHookEx (journ_hook, code, wparam, lparam);
-} /* PTD_Playback_proc */
+}
@@ -270,12 +274,12 @@
}
-extern "C" int WINAPI
+extern "C" BOOL WINAPI
DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserv)
{
switch (reason) {
case DLL_PROCESS_ATTACH:
- glob_hinst = hinst;
+ glob_hinst = hinst;
break;
case DLL_THREAD_ATTACH:
break;
Added: trunk/PTD/wptDNSKeys.cpp
===================================================================
--- trunk/PTD/wptDNSKeys.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/PTD/wptDNSKeys.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -0,0 +1,191 @@
+/* wptDNSKeys.cpp - 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
+ */
+
+#include <windows.h>
+#include <windns.h>
+
+
+/* typedef for the function signature. */
+typedef DNS_STATUS (*dns_query_fnc) (LPSTR, WORD, DWORD, PIP4_ARRAY,
+ PDNS_RECORD*, PVOID *);
+/* function pointer. */
+static dns_query_fnc dns_query = NULL;
+
+/* hinstance handle to the DLL. */
+static HINSTANCE dns_api = NULL;
+
+/* 1 if the DNS api is not available. */
+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
+dns_init (void)
+{
+ if (dns_query)
+ return 0;
+ if (dns_failed)
+ return -1;
+ dns_api = LoadLibrary ("dnsapi");
+ if (!dns_api) {
+ dns_failed = 1;
+ return -1;
+ }
+ dns_query = (dns_query_fnc)GetProcAddress (dns_api, "DnsQuery_A");
+ if (!dns_query) {
+ dns_failed = 1;
+ return -1;
+ }
+ return 0;
+}
+
+/* Cleanup static structs. */
+void
+dns_cleanup (void)
+{
+ if (dns_api)
+ FreeLibrary (dns_api);
+ dns_api = NULL;
+}
+
+
+/* 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)
+{
+ const char *fmt = "._pka.";
+ char *bo;
+ char *pka;
+ int pos=0;
+
+ if ((bo=strchr (uid, '<')) && strchr (uid, '>'))
+ uid += (bo-uid+1);
+ if (!strchr (uid, '@'))
+ return NULL;
+
+ pka = (char*)calloc (1, strlen (uid)+strlen (fmt)+1);
+ while (uid && *uid != '@')
+ pka[pos++] = *uid++;
+ uid++;
+ strcat (pka, "._pka."); pos += strlen (fmt);
+ while (uid && *uid && *uid != '>')
+ pka[pos++] = *uid++;
+ return pka;
+}
+
+
+/* Convert the returned data from the PKA (txt) record. */
+pka_info_t
+parse_pka_data (const char *data)
+{
+ enum pka_col_t { COL_VER=1, COL_FPR, COL_URI };
+ pka_info_t pka;
+ char *p;
+ int pos = 1;
+
+ if (strncmp (data, "v=pka1;", 8))
+ return NULL;
+ pka = (pka_info_t)calloc (1, sizeof *pka);
+ p = strtok ((char*)data, ";");
+ while (p != NULL) {
+ switch (pos) {
+ case COL_VER:
+ pka->ver = 1;
+ break;
+
+ case COL_FPR:
+ pka->fpr = strdup (p+strlen ("fpr="));
+ break;
+
+ case COL_URI: /* optional */
+ pka->uri = strdup (p+strlen ("uri="));
+ break;
+
+ default:
+ break;
+ }
+ pos++;
+ }
+ if (pos != 3) {
+ dns_free_pka_record (pka);
+ pka = NULL;
+ }
+
+ return pka;
+}
+
+
+/* Retrieve a PKA record from the DNS.
+ @userid is used to extract the email address. */
+int
+dns_get_pka_record (const char *userid, pka_info_t *r_pka)
+{
+ char *addr;
+ DNS_STATUS err;
+ DNS_RECORD *rec;
+
+ *r_pka = NULL;
+ if (dns_init ())
+ return -1;
+ addr = email_get_pka_addr (userid);
+ if (!addr)
+ return -1;
+ err = dns_query (addr, DNS_TYPE_TEXT, 0, NULL, &rec, NULL);
+ if (err) {
+ free (addr);
+ return -1;
+ }
+ *r_pka = parse_pka_data (rec->Data.Txt.pStringArray[0]);
+
+ //DnsRecordListFree (rec, DnsFreeRecordList);
+ free (addr);
+ return 0;
+}
Modified: trunk/Po/ChangeLog
===================================================================
--- trunk/Po/ChangeLog 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Po/ChangeLog 2006-07-28 11:11:09 UTC (rev 248)
@@ -1,3 +1,7 @@
+2006-07-25 Timo Schulz <ts at g10code.de>
+
+ * de.po: Fixed fuzzy entries due to spelling corrections.
+
2006-07-10 Timo Schulz <ts at g10code.de>
* de.po: Updated.
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Po/de.po 2006-07-28 11:11:09 UTC (rev 248)
@@ -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-13 09:48+0200\n"
+"POT-Creation-Date: 2006-07-28 12:57+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"
@@ -26,13 +26,13 @@
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:487
-#: Src/WinPT.cpp:494 Src/WinPT.cpp:534 Src/WinPT.cpp:562 Src/WinPT.cpp:571
-#: Src/WinPT.cpp:575 Src/WinPT.cpp:592 Src/WinPT.cpp:660 Src/WinPT.cpp:673
-#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
-#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:528
+#: 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
msgid "WinPT Error"
msgstr "WinPT Fehler"
@@ -62,7 +62,7 @@
msgstr "Konnte WinPT-Verzeichnis nicht erstellen"
#: Src/WinPT.cpp:305 Src/WinPT.cpp:322 Src/WinPT.cpp:333
-#: Src/wptKeyManagerDlg.cpp:994 Src/wptKeyserver.cpp:634
+#: Src/wptKeyManagerDlg.cpp:998 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
@@ -78,17 +78,24 @@
msgid "Failed to copy the keyserver.conf"
msgstr "Kopieren der keyserver.conf ist fehlgeschlagen"
+#: Src/WinPT.cpp:477
+#, 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 ""
+
# c:\oss\winpt-gpgme\src\WinPT.cpp:245
-#: Src/WinPT.cpp:486
+#: Src/WinPT.cpp:484
msgid "Cryptographic selftest failed."
msgstr "Kryptographischer Selbsttest ist fehlgeschlagen."
# c:\oss\winpt-gpgme\src\WinPT.cpp:252
-#: Src/WinPT.cpp:493
+#: Src/WinPT.cpp:491
msgid "A newer GPGME version is needed; at least "
msgstr "Eine neuere Version von GPGME wird benötigt; mindestens "
-#: Src/WinPT.cpp:535
+#: Src/WinPT.cpp:533
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -99,16 +106,16 @@
"Bitte überprüfen Sie die Registryseinträge von GPG:\n"
"%s."
-#: Src/WinPT.cpp:539
+#: Src/WinPT.cpp:537
msgid "Select GPG Public Keyring"
msgstr "Öffentlichen GPG-Schlüsselbund auswählen"
# c:\oss\winpt-gpgme\src\WinPT.cpp:313
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:559
msgid "GPG home directory could not be determined."
msgstr "Heimatverzeichnos von GPG konnte nicht bestimmt werden."
-#: Src/WinPT.cpp:569
+#: Src/WinPT.cpp:567
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -117,12 +124,12 @@
"Möchten Sie die GPG-Einstellungen öffnen um das Problem zu beheben?"
# c:\oss\winpt-gpgme\src\WinPT.cpp:339
-#: Src/WinPT.cpp:584
+#: Src/WinPT.cpp:582
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
"\n"
-"Continue if you want that WinPT offers you more choices.\n"
+"Continue if you want WinPT to offer you more choices.\n"
msgstr ""
"Konnte öffentlichen und geheimen Schlüsselbund nicht finden.\n"
"Wenn das ein Versehen war, bitte das Programm beenden und den Fehler "
@@ -132,20 +139,20 @@
# 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:617 Src/wptFileManagerDlg.cpp:525
+#: Src/WinPT.cpp:615 Src/wptFileManagerDlg.cpp:525
#: Src/wptFileManagerDlg.cpp:835
msgid "Wipe Free Space"
msgstr "Freien Speicher Löschen"
-#: Src/WinPT.cpp:659
+#: Src/WinPT.cpp:657
msgid "Could not register window class"
msgstr "Konnte Fensterklasse nicht registrieren"
-#: Src/WinPT.cpp:673
+#: Src/WinPT.cpp:671
msgid "Could not create window"
msgstr "Konnte Fenster nicht erstellen"
-#: Src/WinPT.cpp:748
+#: Src/WinPT.cpp:746
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -153,15 +160,15 @@
"Der Schlüsselspeicher wurde nicht initialisiert oder ist leer.\n"
"Bitte überprüfen Sie die Konfiguration von GPG (Schlüsselbunde, Pfade)"
-#: Src/WinPT.cpp:751
+#: Src/WinPT.cpp:749
msgid ""
-"It seems that GPG is not set properly.\n"
+"It seems that GPG is not configured properly.\n"
"Do you want to start the GPG preferences dialog?"
msgstr ""
"GPG ist nicht richtig konfiguriert.\n"
"Den GPG-Einstellungsdialog starten?"
-#: Src/WinPT.cpp:769
+#: Src/WinPT.cpp:767
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -183,8 +190,8 @@
msgid "About GnuPG"
msgstr "Über GnuPG"
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1892
-#: Src/wptMainProc.cpp:577
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
+#: Src/wptMainProc.cpp:593
msgid "About WinPT"
msgstr "Über WinPT"
@@ -239,11 +246,11 @@
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:700
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "&Help"
msgstr "&Hilfe"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:402
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
msgid "Card Manager"
msgstr "Kartenmanager"
@@ -267,7 +274,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:284
+#: Src/wptMainProc.cpp:291
msgid "Card Edit"
msgstr "Karten-Editor"
@@ -319,7 +326,7 @@
#: Src/wptCardDlg.cpp:505
msgid ""
"This operation will override the keys on the card.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Diese Operation wird die Schlüssel auf der Karte überschreiben.\n"
"Trotzdem fortfahren?"
@@ -356,7 +363,7 @@
msgid "Make off-card backup of encryption key"
msgstr "Externes Backup des Verschlüsselungs-Schlüssel"
-#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1788
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
msgid "Card Key Generation"
msgstr "Karten-Schlüsselerzeugung"
@@ -385,8 +392,8 @@
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:448
-msgid "The date you have chosen lies in the past."
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+msgid "The date you have chosen has already passed."
msgstr "Das gewählte Datum liegt in der Vergangenheit."
# c:\oss\winpt-gpgme\src\wptCardDlg.cpp:696
@@ -411,11 +418,11 @@
msgstr "Bitte neue Karten-PIN eingeben."
#: Src/wptCardDlg.cpp:731
-msgid "Admin PIN must be minimal 8 characters."
+msgid "Admin PIN must be at least 8 characters."
msgstr "Die 'Admin PIN' muss mindestens 8 Zeichen lang sein."
#: Src/wptCardDlg.cpp:736
-msgid "PIN must be minimal 6 characters."
+msgid "PIN must be at least 6 characters."
msgstr "Die 'Benutzer PIN' muss mindestens 6 Zeichen lang sein."
# c:\oss\winpt-gpgme\src\wptCardDlg.cpp:766
@@ -487,8 +494,7 @@
"*** Signatur erstellt: %s\r\n"
"*** Signatur überprüft: %s\r\n"
"*** %s\r\n"
-"*** Signatur: %s\r\\n"
-"*** Unterzeichner: %s (0x%s)\r\n"
+"*** Signatur: %s\r\\n*** Unterzeichner: %s (0x%s)\r\n"
"*** BEGINN PGP ENTSCHLÜSSELTER TEXT ***\r\n"
#: Src/wptClipDecryptDlg.cpp:131
@@ -524,8 +530,8 @@
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
-#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
+#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
msgid "Verify"
msgstr "Überprüfen"
@@ -561,7 +567,7 @@
"WARNING: encrypted message has been manipulated!\n"
"\n"
"Do *NOT* trust any text or data output from this file!\n"
-"It is likely, the data was corrupted during the transport\n"
+"It is likely that the data was corrupted in transport\n"
"but it might be also possible that this is part of an attack."
msgstr ""
"WARNUNG: verschlüsselete Nachricht wurde manipuliert!\n"
@@ -576,7 +582,7 @@
#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:781 Src/wptKeyManager.cpp:971 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:801 Src/wptKeyManager.cpp:991 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "GnuPG-Status: Abgeschlossen"
@@ -584,8 +590,8 @@
#: 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:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
+#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
msgid "Clipboard"
msgstr "Zwischenablage"
@@ -596,7 +602,7 @@
#: Src/wptClipEditDlg.cpp:122
msgid ""
"The file you want to add is very large.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Die Datei, die Sie hinzufügen wollen, ist sehr groß!\n"
"Wirklich fortfahren?"
@@ -642,7 +648,7 @@
msgid "&Decrypt"
msgstr "&Entschlüsseln"
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:571
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
msgid "Clipboard Editor"
msgstr "Zwischenablagen-Editor"
@@ -657,8 +663,8 @@
#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:155
#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipEncryptDlg.cpp:212
-#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:146
-#: Src/wptMainProc.cpp:209
+#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
+#: Src/wptMainProc.cpp:216
msgid "Encryption"
msgstr "Verschlüsseln"
@@ -674,7 +680,7 @@
#: 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:538 Src/wptKeyRevokeDlg.cpp:79
+#: 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/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
@@ -708,7 +714,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
+#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
msgid "Signing"
msgstr "Signieren"
@@ -727,7 +733,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:221
+#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
msgid "Sign & Encrypt"
msgstr "Signieren & Verschlüsseln"
@@ -821,8 +827,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:1028
-#: Src/wptKeyManagerDlg.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1929
msgid "Key Edit"
msgstr "Schlüssel bearbeiten"
@@ -860,8 +866,8 @@
#: Src/wptErrors.cpp:52
#, c-format
msgid ""
-"Could not find keyring entries into the options file in %s or the file does "
-"NOT exist."
+"Could not find keyring entries in the config file in %s or the file does NOT "
+"exist."
msgstr ""
"Keine Eintragungen für Schlüsselbünde in der Optionendatei in %s gefunden "
"oder Datei existiert nicht."
@@ -1040,7 +1046,7 @@
#: 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:400 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "Dateimanager"
@@ -1070,7 +1076,7 @@
#: Src/wptFileManager.cpp:195
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
-"them anyway and this costs a lot of time.\n"
+"them anyway and this takes a lot of time.\n"
"It is possible to disable compression for these files.\n"
"Do you want to disable it?"
msgstr ""
@@ -1127,13 +1133,13 @@
msgstr "Konnte den geheimen Standardschlüssel nicht finden."
#: Src/wptFileManager.cpp:1183 Src/wptFileManager.cpp:1495
-#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:197
-#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:417
+#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
msgid "Sign"
msgstr "Signieren"
#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:587
-#: Src/wptMainProc.cpp:409 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
msgid "Encrypt"
msgstr "Verschlüsseln"
@@ -1142,7 +1148,7 @@
msgstr "Symmetrisch verschlüsseln"
#: Src/wptFileManager.cpp:1256 Src/wptFileManager.cpp:1261
-#: Src/wptMainProc.cpp:408 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
msgid "Symmetric"
msgstr "Symmetrisch"
@@ -1239,8 +1245,8 @@
msgid "Export"
msgstr "Export"
-#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1852
-#: Src/wptKeyManagerDlg.cpp:1884
+#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1897
msgid "Choose Name for Key File"
msgstr "Den Namen der Schlüsseldatei wählen"
@@ -1305,7 +1311,7 @@
msgstr "&Schlüssel zum Signieren"
#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:292
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Options"
msgstr "Optionen"
@@ -1329,7 +1335,7 @@
msgstr "%s enthält %d Schlüssel."
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Datei"
@@ -1367,11 +1373,11 @@
#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:701 Src/wptKeyManager.cpp:802
-#: Src/wptKeyManager.cpp:836 Src/wptKeyManagerDlg.cpp:1665
-#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeyManagerDlg.cpp:1709
-#: Src/wptKeyManagerDlg.cpp:1720 Src/wptKeyManagerDlg.cpp:1735
-#: Src/wptKeyManagerDlg.cpp:1842 Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManager.cpp:721 Src/wptKeyManager.cpp:822
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1678
+#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "Bitte wählen Sie einen Schlüssel aus."
@@ -1385,17 +1391,17 @@
msgid "%d Object(s) marked"
msgstr "%d Objekt(e) markiert"
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:541
+#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
msgid "File Manager (use drag & drop to add files)"
msgstr "Dateimanager (Drag & Drop möglich)"
-#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:966
-#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptMainProc.cpp:405
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptMainProc.cpp:421
msgid "Edit"
msgstr "Bearbeiten"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
msgid "View"
msgstr "Ansicht"
@@ -1403,13 +1409,13 @@
msgid "Encrypt into ZIP"
msgstr "Verschlüsseln in ZIP"
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Sign"
msgstr "&Signieren"
#: Src/wptFileManagerDlg.cpp:512 Src/wptFileManagerDlg.cpp:590
-#: Src/wptMainProc.cpp:411 Src/wptMainProc.cpp:415
+#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
msgid "Sign && Encrypt"
msgstr "Signieren && Verschlüsseln"
@@ -1429,7 +1435,7 @@
msgid "E&xport"
msgstr "E&xportieren"
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:407
+#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
msgid "Exit"
msgstr "Beenden"
@@ -1487,11 +1493,11 @@
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:102
+#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
msgid "&Yes"
msgstr "&Ja"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:103
+#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
msgid "&No"
msgstr "&Nein"
@@ -1563,7 +1569,7 @@
msgstr "WinPT Erster Start"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:728
-#: Src/wptGPG.cpp:839
+#: Src/wptGPG.cpp:830
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1573,19 +1579,19 @@
"In diesem Zustand kann nichts gespeichert werden\n"
"Wollen Sie das Attribut zurücksetzen?"
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:833
msgid "GPG Information"
msgstr "GPG Information"
-#: Src/wptGPG.cpp:846
+#: Src/wptGPG.cpp:837
msgid "Could not reset read-only state."
msgstr "Konnte den Nur-Lesen Zustand nicht zurücksetzen."
-#: Src/wptGPG.cpp:847 Src/wptGPG.cpp:1130 Src/wptGPG.cpp:1139
+#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
msgid "GPG Error"
msgstr "GPG Fehler"
-#: Src/wptGPG.cpp:859
+#: Src/wptGPG.cpp:850
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1599,23 +1605,23 @@
"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:864
+#: Src/wptGPG.cpp:855
msgid "GPG Warning"
msgstr "GPG Warnung"
-#: Src/wptGPG.cpp:888 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
+#: 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:993
-#: Src/wptMainProc.cpp:428 Src/wptPreferencesDlg.cpp:225
+#: 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
msgid "Preferences"
msgstr "Einstellungen"
-#: Src/wptGPG.cpp:889
+#: Src/wptGPG.cpp:880
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1624,55 +1630,55 @@
"%s existiert nicht.\n"
"Möchten Sie dieses Verzeichnis erstellen?"
-#: Src/wptGPG.cpp:917
+#: Src/wptGPG.cpp:908
msgid "Please choose your Public Keyring"
msgstr "Bitte wählen Sie Ihren öffentlichen Schlüsselbund."
-#: Src/wptGPG.cpp:920 Src/wptGPG.cpp:942
+#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
msgid "No keyring was chosen. Exit."
msgstr "Kein Schlüsselbund ausgewählt. Abbruch."
-#: Src/wptGPG.cpp:927
+#: Src/wptGPG.cpp:918
msgid "Overwrite old public keyring?"
msgstr "Alten öff. Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:954
+#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
msgid "Could not copy file."
msgstr "Datei konnte nicht kopiert werden"
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:930
msgid "Please choose your Secret Keyring"
msgstr "Bitte wählen Sie Ihren geheimen Schlüsselbund"
-#: Src/wptGPG.cpp:948
+#: Src/wptGPG.cpp:939
msgid "Overwrite old secret keyring?"
msgstr "Alten geheimen Schlüsselbund überschreiben?"
-#: Src/wptGPG.cpp:998 Src/wptGPG.cpp:1089 Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
msgid "Backup"
msgstr "Sicherung"
-#: Src/wptGPG.cpp:998
+#: Src/wptGPG.cpp:989
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Schlüsselbundsicherung \"%s\" fehlgeschlagen"
# c:\oss\winpt-gpgme\src\wptGPG.cpp:1021
-#: Src/wptGPG.cpp:1090
+#: Src/wptGPG.cpp:1079
#, c-format
msgid ""
-"The backup drive '%s' does not seems to accessable.\n"
+"The backup drive '%s' does not seems to be accessable.\n"
"Please insert/check the drive to continue."
msgstr ""
"Kann auf das Backup-Laufwerk '%s' nicht zugreifen.\n"
"Bitte aktivieren/überprüfen sie das Laufwerk um Fortzufahren."
-#: Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:1091
#, c-format
msgid "Invalid backup mode %d"
msgstr "Ungültiger Sicherungsmethode %d"
-#: Src/wptGPG.cpp:1129
+#: Src/wptGPG.cpp:1118
msgid "No GPG error description available."
msgstr "Keine Fehlerbeschreibung von GPG verfügbar."
@@ -1708,13 +1714,13 @@
msgid "Good Signature (Revoked Key)"
msgstr "Gültige Signatur (Widerrufener Schlüssel)"
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:97
+#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
msgid "Could not load GnuPG config file!"
msgstr "Konnte GnuPG Konfigurationsdatei nicht laden!"
-#: Src/wptGPGOptDlg.cpp:49 Src/wptGPGOptDlg.cpp:69 Src/wptGPGOptDlg.cpp:75
-#: Src/wptGPGOptDlg.cpp:80 Src/wptGPGOptDlg.cpp:84 Src/wptGPGOptDlg.cpp:91
-#: Src/wptGPGOptDlg.cpp:97
+#: 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
msgid "GPG Config"
msgstr "GPG Konfiguration"
@@ -1727,23 +1733,27 @@
msgid "&Load"
msgstr "&Laden"
-#: Src/wptGPGOptDlg.cpp:69
+#: Src/wptGPGOptDlg.cpp:57
+msgid "&Exit"
+msgstr "&Beenden"
+
+#: Src/wptGPGOptDlg.cpp:70
msgid "The 'gpg.conf' file is not loaded."
msgstr "Die 'gpg.conf' wurde nicht geladen"
-#: Src/wptGPGOptDlg.cpp:75
+#: Src/wptGPGOptDlg.cpp:76
msgid "File contains invalid GnuPG keywords!"
msgstr "Datei enthält ungültige GnuPG-Schlüsselwörter!"
-#: Src/wptGPGOptDlg.cpp:80
+#: Src/wptGPGOptDlg.cpp:81
msgid "Could not save GnuPG config file."
msgstr "Konnte GnuPG Konfigurationsdatei nicht speichern."
-#: Src/wptGPGOptDlg.cpp:84
+#: Src/wptGPGOptDlg.cpp:85
msgid "Successfully saved."
msgstr "Erfolgreich gespeichert."
-#: Src/wptGPGOptDlg.cpp:90
+#: Src/wptGPGOptDlg.cpp:91
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -1751,8 +1761,8 @@
"Aktuelle Daten gehen verloren\n"
"Sind Sie sicher?"
-#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1814
-#: Src/wptMainProc.cpp:589
+#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:605
msgid "GnuPG Preferences"
msgstr "GnuPG-Einstellungen"
@@ -1841,27 +1851,27 @@
#: Src/wptKeyManager.cpp:440 Src/wptKeyManager.cpp:443
#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:454
#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:587
-#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:701
-#: Src/wptKeyManager.cpp:729 Src/wptKeyManager.cpp:738
-#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:775
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:807
-#: Src/wptKeyManager.cpp:831 Src/wptKeyManager.cpp:836
-#: Src/wptKeyManager.cpp:850 Src/wptKeyManager.cpp:907
-#: Src/wptKeyManager.cpp:912 Src/wptKeyManager.cpp:969
-#: Src/wptKeyManager.cpp:1002 Src/wptKeyManager.cpp:1086
-#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
-#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1643
-#: Src/wptKeyManagerDlg.cpp:1666 Src/wptKeyManagerDlg.cpp:1681
-#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1699
-#: Src/wptKeyManagerDlg.cpp:1709 Src/wptKeyManagerDlg.cpp:1720
-#: Src/wptKeyManagerDlg.cpp:1735 Src/wptKeyManagerDlg.cpp:1752
-#: Src/wptKeyManagerDlg.cpp:1784 Src/wptKeyManagerDlg.cpp:1843
-#: Src/wptKeyManagerDlg.cpp:1861 Src/wptKeyManagerDlg.cpp:1866
-#: Src/wptKeyManagerDlg.cpp:1871 Src/wptKeyManagerDlg.cpp:1942
-#: Src/wptKeyManagerDlg.cpp:1947 Src/wptKeyManagerDlg.cpp:2060
+#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:721
+#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:758
+#: Src/wptKeyManager.cpp:769 Src/wptKeyManager.cpp:795
+#: Src/wptKeyManager.cpp:822 Src/wptKeyManager.cpp:827
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:932 Src/wptKeyManager.cpp:989
+#: Src/wptKeyManager.cpp:1022 Src/wptKeyManager.cpp:1106
+#: 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/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:401 Src/wptMainProc.cpp:552 Src/wptMainProc.cpp:560
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
msgid "Key Manager"
msgstr "Schlüsselverwaltung"
@@ -1966,20 +1976,20 @@
msgstr "Ungültige Benutzerkennung"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
msgstr "Benutzerkennung"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:916 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:911
-#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
@@ -1987,13 +1997,13 @@
#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1073
#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Erstellung"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
msgid "Type"
msgstr "Typ"
@@ -2001,7 +2011,7 @@
#: Src/wptImportList.cpp:419
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
-"and thus a CRC error occurs."
+"and thus causing a CRC error."
msgstr ""
"Es ist möglich das der ASCII-Armor beschädigt wurde\n"
"und deshalb ein CRC Fehler auftrat."
@@ -2054,7 +2064,7 @@
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
-"close to 240x288 is a good size to use."
+"close to 240x288 is advised."
msgstr ""
"Bitte denken Sie daran das das Image im Schlüssel gespeichert wird. Wenn Sie "
"ein grosses Bild benutzen, wird Ihr Schlüssel ebenfalls sehr gross! ein "
@@ -2113,8 +2123,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:490
-#: Src/wptKeygenDlg.cpp:591 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
+#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "GnuPG-Status"
@@ -2223,7 +2233,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:1698
+#: Src/wptKeyManagerDlg.cpp:1711
msgid "There is no secret key available!"
msgstr "Kein geheimer Schlüssel vorhanden!"
@@ -2263,20 +2273,20 @@
#: Src/wptKeyEditDlgs.cpp:1037
msgid ""
"Are you sure that you really don't want a passphrase?\n"
-"This is propably a bad idea, still proceed?"
+"This is propably a bad idea, continue?"
msgstr ""
"Sind Sie sicher das Sie wirklich keine Passphrase wollen?\n"
"Das ist generell keine gute Idee, trotzdem fortfahren?"
#: Src/wptKeyEditDlgs.cpp:1053
-msgid "Change Passwd"
-msgstr "Passwort ändern"
+msgid "Change Password"
+msgstr "&Passwort ändern"
#: Src/wptKeyEditDlgs.cpp:1055
msgid "Passphrase successfully changed."
msgstr "Passwort erfolgreich geändert."
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
msgid "Description"
msgstr "Beschreibung"
@@ -2285,7 +2295,7 @@
msgstr "Verfällt"
#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyManagerDlg.cpp:918
msgid "Validity"
msgstr "Gültigkeit"
@@ -2298,7 +2308,7 @@
"ADDUID add a user ID\r\n"
"ADDPHOTO add a photo ID\r\n"
"DELUID delete a user ID\r\n"
-"ADDKEY add a secondard key\r\n"
+"ADDKEY add a secondary key\r\n"
"DELKEY delete a secondary key\r\n"
"ADDREVOKER add a revocation key\r\n"
"EXPIRE change the expire date\r\n"
@@ -2525,7 +2535,7 @@
"%s\n"
"\n"
"Are you sure you want to create a revocation certificate\n"
-"which allow to revoke the key listed above?"
+"which allows you to revoke the key listed above?"
msgstr ""
"Ihr Schlüssel ist gelistet als vorgesehener Widerrufer\n"
"\n"
@@ -2588,7 +2598,7 @@
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys (by looking at passports, checking fingerprint from different "
-"source...)?"
+"sources...)?"
msgstr ""
"Bitte entscheiden Sie wie sehr sie dem Nutzer zutrauen andere "
"Nutzerschlüssel zu überprüfen (mittels Personalausweis, Fingerprint, ...)?"
@@ -2598,8 +2608,8 @@
msgstr "Bitte wählen Sie einen Eintrag."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1908 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2618,11 +2628,11 @@
msgstr "Schlüsselerzeugung - Fortschrittsdialog"
#: Src/wptKeygenCBDlg.cpp:85 Src/wptKeygenDlg.cpp:298 Src/wptKeygenDlg.cpp:307
-#: Src/wptKeygenDlg.cpp:371 Src/wptKeygenDlg.cpp:405 Src/wptKeygenDlg.cpp:410
-#: Src/wptKeygenDlg.cpp:415 Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:427
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:449 Src/wptKeygenDlg.cpp:456
-#: Src/wptKeygenDlg.cpp:466 Src/wptKeygenDlg.cpp:487 Src/wptKeygenDlg.cpp:570
-#: Src/wptKeyManagerDlg.cpp:1775 Src/wptPassphraseDlg.cpp:147
+#: 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/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Schlüsselerzeugung"
@@ -2689,7 +2699,7 @@
#: Src/wptKeygenDlg.cpp:373
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
-"message that key generation was finished."
+"message that key generation has finished."
msgstr ""
"Die Schlüsselerstellung kann eine Weile dauern! Bitte warten Sie, bis eine "
"Meldung über die Beendigung der Schlüsselerzeugung erscheint."
@@ -2706,58 +2716,58 @@
msgid "Key &type"
msgstr "Schlüssel &Typ"
-#: Src/wptKeygenDlg.cpp:404
+#: Src/wptKeygenDlg.cpp:415
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Ungültige Eingabe. Erlaubte Werte sind 1024-4096 Bit."
-#: Src/wptKeygenDlg.cpp:409
+#: Src/wptKeygenDlg.cpp:420
msgid "Do you really need such a large key?"
msgstr "Benötigen Sie wirklich solch einen großen Schlüssel?"
-#: Src/wptKeygenDlg.cpp:415 Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
msgid "Please enter the name."
msgstr "Bitte geben Sie einen Namen ein."
-#: Src/wptKeygenDlg.cpp:419 Src/wptKeygenDlg.cpp:552
+#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
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:426 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
msgid "Please enter a valid email address."
msgstr "Bitte geben Sie eine E-Mail-Adresse ein."
-#: Src/wptKeygenDlg.cpp:434
+#: Src/wptKeygenDlg.cpp:445
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:465 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:476 Src/wptKeyRevokeDlg.cpp:180
msgid "Please enter the passphrase."
msgstr "Bitte das Passwort eingeben."
-#: Src/wptKeygenDlg.cpp:490 Src/wptKeygenDlg.cpp:591
+#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
msgid "Key Generation completed"
msgstr "Schlüsselerzeugung abgeschlossen"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:589
-#: Src/wptKeygenDlg.cpp:531
+#: Src/wptKeygenDlg.cpp:542
msgid "&Prefer RSA keys"
msgstr "RSA Schlüssel &bervorzugen"
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:543
msgid "Real name:"
msgstr "Ihr Name:"
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:544
msgid "Email address:"
msgstr "E-Mail-&Adresse:"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:592
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:545
msgid "Name and E-Mail Assignment"
msgstr "Name und E-Mail Zuweisung"
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:593
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:546
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"
@@ -2768,7 +2778,7 @@
"Schlüssel zu Ihen gehört."
# c:\oss\winpt-gpgme\src\wptKeygenDlg.cpp:594
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:547
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -2779,13 +2789,13 @@
"Schlüssel auswählen\n"
"wenn dise mit Ihnen kommunizieren wollen."
-#: Src/wptKeygenDlg.cpp:537 Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:553
-#: Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:566 Src/wptKeygenDlg.cpp:587
-#: Src/wptKeyManagerDlg.cpp:1798
+#: 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
msgid "Key Generation Wizard"
msgstr "Schlüsselerzeugungs-Assistent"
-#: Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr "Bitte nicht '<' oder '>' zu der E-Mail-Adresse hinzufueen."
@@ -2870,12 +2880,12 @@
msgid "key pair"
msgstr "Schlüsselpaar"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "Cipher"
msgstr "Cipher"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "Vertrauen"
@@ -2952,7 +2962,7 @@
#: Src/wptKeyManager.cpp:452
msgid ""
-"The key you want to import is dash escacped.\n"
+"The key you want to import is dash escaped.\n"
"Do you want to extract the key?"
msgstr ""
"Der Schlüssel ist \"dash escaped\".\n"
@@ -2998,15 +3008,15 @@
msgid "Could not read key-data from file."
msgstr "Konnte Schlüsseldaten nicht aus Datei lesen."
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:726
msgid "Do you really want to confirm each key?"
msgstr "Wollen Sie wirklich jeden Schlüssel bestätigen?"
-#: Src/wptKeyManager.cpp:707
+#: Src/wptKeyManager.cpp:727
msgid "Delete Confirmation"
msgstr "Löschen Bestätigen"
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:750
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -3018,7 +3028,7 @@
"%s"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:605
-#: Src/wptKeyManager.cpp:739
+#: Src/wptKeyManager.cpp:759
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3035,7 +3045,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:746
+#: Src/wptKeyManager.cpp:766
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3045,265 +3055,269 @@
"Nur der öffentliche Schlüssel und der Zeiger auf den geheimen\n"
"Schlüssel werden gelöscht.\n"
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828
#, c-format
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:830
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "Bitte nur einen Schlüssel auswählen."
-#: Src/wptKeyManager.cpp:906
+#: Src/wptKeyManager.cpp:926
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:911
+#: Src/wptKeyManager.cpp:931
msgid "Could not connect to keyserver, abort procedure."
msgstr ""
"Verbindung zum Keyserver fehlgeschlagen; Die Prozedur wird abgebrochen."
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search"
msgstr "Suchen"
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search for:"
msgstr "Suche nach:"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:896
-#: Src/wptKeyManager.cpp:997
+#: Src/wptKeyManager.cpp:1017
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Zeichenkette \"%s\" nicht gefunden."
-#: Src/wptKeyManager.cpp:1063 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1083 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. Kein Grund angeben"
-#: Src/wptKeyManager.cpp:1064 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1084 Src/wptKeyRevokeDlg.cpp:86
msgid "1. Key has been compromised"
msgstr "1. Der Schlüssel ist nicht mehr sicher"
-#: Src/wptKeyManager.cpp:1065 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. Der Schlüssel ist veraltet"
-#: Src/wptKeyManager.cpp:1066 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:88
msgid "3. Key is no longer used"
msgstr "3. Der Schlüssel wird nicht mehr benutzt"
-#: Src/wptKeyManagerDlg.cpp:486 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
msgid "Paste Key from Clipboard"
msgstr "Schlüssel aus Ablage einfügen"
-#: Src/wptKeyManagerDlg.cpp:507
+#: Src/wptKeyManagerDlg.cpp:508
#, c-format
msgid "Default Key: %s"
msgstr "Standardschlüssel: %s"
-#: Src/wptKeyManagerDlg.cpp:509
+#: Src/wptKeyManagerDlg.cpp:510
#, c-format
msgid "Default Key: 0x%s"
msgstr "Standardschlüssel: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:530
+#: Src/wptKeyManagerDlg.cpp:532
#, c-format
msgid "%d secret keys"
msgstr "%d geheime Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManager.cpp:849
-#: Src/wptKeyManagerDlg.cpp:531
+#: Src/wptKeyManagerDlg.cpp:533
#, c-format
msgid "%d keys"
msgstr "%d Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Key"
msgstr "Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
+#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
msgid "Groups"
msgstr "Gruppen"
# c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:478
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Send Mail..."
msgstr "E-Mail versenden..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:685
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tCtrl+C"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:686
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Paste\tCtrl+V"
msgstr "&Einfügen\tCtrl+V"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:687
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Search...\tCtrl+F"
msgstr "Suchen...\tCtrl+F"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:688
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Select All\tCtrl+A"
msgstr "Alles markieren\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Quit"
msgstr "&Beenden"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:984
msgid "&Expert"
msgstr "&Experte"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:985
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Delete"
msgstr "&Löschen"
-#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
msgid "&Revoke Cert"
msgstr "Widerruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
msgid "&List Signatures"
msgstr "Signaturen anzeigen"
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1715
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Zeige Vertrauenspfad"
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:993
msgid "&Export..."
msgstr "&Exportieren..."
-#: Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Import..."
msgstr "&Importieren..."
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "&Eigenschaften"
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:999
msgid "E&xport Secret Key"
msgstr "E&xportiere geheimen Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Re&load Key Cache"
msgstr "Erneuere Sch&lüsselcache"
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "R&everify Signatures"
msgstr "Signaturen erneut prüfen"
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "Refresh &Keys (Keyserver)"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:999 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Über"
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key ID to Clipboard"
msgstr "Kopiere Schlüssel ID in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:887
-#: Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Copy Fingerprint to Clipboard"
msgstr "Kopiere Fingerprint in Ablage"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
-#: Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Copy Key Info to Clipboard"
msgstr "Kopiere Schlüssel Info in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1026
+msgid "Copy E-Mail to Clipboard"
+msgstr "Kopiere E-Mail in Ablage"
+
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Copy Key to Clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "Refresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:884
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1030
msgid "Set Implicit &Trust"
msgstr "Setze impliziertes Vertrauen"
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "&Enable"
msgstr "&Aktivieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:892
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "&Disable"
msgstr "&Deaktivieren"
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Re&fresh from Keyserver"
msgstr "Vom Schlüsselserver aktualisieren"
-#: Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set preferred Keyserver URL"
msgstr "Setze bevorzugte Keyserver URL"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:900
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Send Key to Mail Recipient"
msgstr "Sende Schlüssel an Mailempfänger"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:904
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Set as Default Key"
msgstr "Setze als Default Key"
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Key..."
msgstr "Schlüssel..."
-#: Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "User ID..."
msgstr "Benutzerkennung..."
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Photo ID..."
msgstr "Photo ID..."
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Revoker..."
msgstr "Widerrufer..."
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:706
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Key Attributes"
msgstr "Schlüsselattribute"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:707
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1051
msgid "Add"
msgstr "Hinzufügen"
-#: Src/wptKeyManagerDlg.cpp:1047
+#: Src/wptKeyManagerDlg.cpp:1052
msgid "Send to Keyserver"
msgstr "Sende an Keyserver"
-#: Src/wptKeyManagerDlg.cpp:1323
+#: Src/wptKeyManagerDlg.cpp:1335
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3311,75 +3325,75 @@
"Keinen explizit vertrauenswürdigen Schlüssel gefunden.\n"
"Bitte setzten Sie zumindest einen geheimen Schlüssel auf absolutes Vertrauen."
-#: Src/wptKeyManagerDlg.cpp:1352
+#: Src/wptKeyManagerDlg.cpp:1364
msgid "&Show"
msgstr "&Anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1353
+#: Src/wptKeyManagerDlg.cpp:1365
msgid "&New..."
msgstr "&Neu..."
# c:\oss\winpt-gpgme\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1464
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "Generate new key pair"
msgstr "Neues Schlüsselpaar erzeugen"
-#: Src/wptKeyManagerDlg.cpp:1468
+#: Src/wptKeyManagerDlg.cpp:1481
msgid "Search for a specific key"
msgstr "Suche nach einem bestimmten Schlüssel"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:842
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1485
msgid "Delete key from keyring"
msgstr "Schlüssel aus Keyring löschen"
-#: Src/wptKeyManagerDlg.cpp:1476
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Show key properties"
msgstr "Schlüsseleigenschaften anzeigen"
-#: Src/wptKeyManagerDlg.cpp:1480
+#: Src/wptKeyManagerDlg.cpp:1493
msgid "Sign key"
msgstr "Signiere Schlüssel"
-#: Src/wptKeyManagerDlg.cpp:1484
+#: Src/wptKeyManagerDlg.cpp:1497
msgid "Copy key to clipboard"
msgstr "Kopiere Schlüssel in Ablage"
-#: Src/wptKeyManagerDlg.cpp:1488
+#: Src/wptKeyManagerDlg.cpp:1501
msgid "Paste key from clipboard"
msgstr "Schlüssel aus Ablage einfügen"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:854
-#: Src/wptKeyManagerDlg.cpp:1492
+#: Src/wptKeyManagerDlg.cpp:1505
msgid "Import key to keyring"
msgstr "In Schlüsselbund importieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:858
-#: Src/wptKeyManagerDlg.cpp:1496
+#: Src/wptKeyManagerDlg.cpp:1509
msgid "Export key to a file"
msgstr "Schlüssel in Datei exportieren"
# c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:499
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeyManagerDlg.cpp:1643
msgid "New"
msgstr "Neu"
-#: Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1655
msgid "Could not access public keyring"
msgstr "Konnte nicht auf öffentlichen Schlüsselbund zugreifen"
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeysignDlg.cpp:325
+#: 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
msgid "Key Signing"
msgstr "Schlüsselsignierung"
-#: Src/wptKeyManagerDlg.cpp:1690
+#: Src/wptKeyManagerDlg.cpp:1703
msgid "Key already revoked!"
msgstr "Schlüssel ist bereits widerrufen!"
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1717 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
@@ -3387,15 +3401,15 @@
msgid "Key Revocation Cert"
msgstr "Schlüsselwiderruf Zertifikat"
-#: Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptKeyManagerDlg.cpp:1739
msgid "Key Signature List"
msgstr "Schlüssel-Signatur-Liste"
-#: Src/wptKeyManagerDlg.cpp:1743 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "Schlüsseleigenschaften"
-#: Src/wptKeyManagerDlg.cpp:1753
+#: Src/wptKeyManagerDlg.cpp:1766
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3404,27 +3418,27 @@
"Signierung etc.)\n"
"Möchten Sie den Zwischenspeicher reinitialisieren?"
-#: Src/wptKeyManagerDlg.cpp:1783
+#: Src/wptKeyManagerDlg.cpp:1796
msgid "Smart Card support is not available."
msgstr "SmartCard-Unterstützung ist nicht verfügbar."
-#: Src/wptKeyManagerDlg.cpp:1806 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
msgid "Keyserver Access"
msgstr "Schlüsselserver-Zugriff"
-#: Src/wptKeyManagerDlg.cpp:1823
+#: Src/wptKeyManagerDlg.cpp:1836
msgid "GnuPG Options"
msgstr "GnuPG Optionen"
-#: Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "There is no corresponding secret key for this key."
msgstr "Für diesen Schlüssel ist kein geheimer Schlüssel vorhanden."
-#: Src/wptKeyManagerDlg.cpp:1870
+#: Src/wptKeyManagerDlg.cpp:1883
msgid "You can only export one secret key."
msgstr "Sie können nur einen geheimen Schlüssel exportieren."
-#: Src/wptKeyManagerDlg.cpp:1875
+#: Src/wptKeyManagerDlg.cpp:1888
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3442,15 +3456,15 @@
"\n"
"Wirklich den Schlüssel exportieren?"
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptKeyManagerDlg.cpp:1893
msgid "WARNING"
msgstr "WARNUNG"
-#: Src/wptKeyManagerDlg.cpp:1941
+#: Src/wptKeyManagerDlg.cpp:1954
msgid "No key was selected, select all by default."
msgstr "Kein Schlüssel ausgewählt, es wurden alle ausgewählt."
-#: Src/wptKeyManagerDlg.cpp:1946
+#: Src/wptKeyManagerDlg.cpp:1959
msgid "Keyserver refresh finished."
msgstr "Erneuerung von Keyserver abgeschlossen."
@@ -3559,7 +3573,7 @@
#: Src/wptKeyRevokeDlg.cpp:134
msgid ""
-"Please move this certificate to a medium where it can bestored in a safe "
+"Please move this certificate to a medium where it can be stored in a safe "
"place (floppy, CDR, etc..).\n"
"If an attacker gets access to this certificate he can use it to render your "
"key unusable!"
@@ -3633,7 +3647,7 @@
#: Src/wptKeyserver.cpp:678
msgid ""
-"Invalid proxy configuration.You need to set a user and a password to use "
+"Invalid proxy configuration. You need to set a user and a password to use "
"proxy authentication!"
msgstr ""
"Ungültige Proxy-Konfiguration. Sie müssen einen Benutzernamen und ein "
@@ -3779,8 +3793,8 @@
msgstr "Schlüssel senden (sonst empfangen)"
#: Src/wptKeyserverDlg.cpp:582
-msgid "Please enter the key ID or email address you search for"
-msgstr "Bitte die key ID oder E-Mail-Adresse angeben die gesucht wird"
+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
msgid "&Search"
@@ -3994,7 +4008,7 @@
# c:\oss\winpt-gpgme\src\wptKeysignDlg.cpp:160
#: Src/wptKeysignDlg.cpp:232
-msgid "(3) I have done very careful checkings."
+msgid "(3) I have done very careful checking."
msgstr "(3) Ich habe gründliche Überprüfungen gemacht."
#: Src/wptKeysignDlg.cpp:271
@@ -4067,62 +4081,62 @@
msgstr "Vertrauensliste"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:115
-#: Src/wptMainProc.cpp:97
+#: Src/wptMainProc.cpp:104
msgid "Delete Clipboard Contents"
msgstr "Lösche Inhalt der Zwischenablage"
-#: Src/wptMainProc.cpp:99
+#: Src/wptMainProc.cpp:106
msgid "&Remember the answer"
msgstr "&Nicht mehr nachfragen"
-#: Src/wptMainProc.cpp:101
+#: Src/wptMainProc.cpp:108
msgid "Do you want to delete the contents from the clipboard?"
msgstr "Wollen Sie den Inhalt der Zwischenablage löschen?"
-#: Src/wptMainProc.cpp:197
+#: Src/wptMainProc.cpp:204
msgid "Could not access secret keyring."
msgstr "Auf denn geheimen Schlüsselbund konnte nicht zugegriffen werden."
-#: Src/wptMainProc.cpp:245 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Texteingabe"
-#: Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:273
msgid "Unknown OpenPGP type."
msgstr "Unbekannter OpenPGP-Typ."
-#: Src/wptMainProc.cpp:344
+#: Src/wptMainProc.cpp:370
msgid "Could not set current window mode hooks."
msgstr "Konnte \"Current Window\" Hooks nicht setzen."
-#: Src/wptMainProc.cpp:406
+#: Src/wptMainProc.cpp:422
msgid "About..."
msgstr "Über..."
-#: Src/wptMainProc.cpp:412 Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
msgid "Decrypt/Verify"
msgstr "Entschlüsseln/Überprüfen"
# c:\oss\winpt-gpgme\src\wptMainProc.cpp:414
-#: Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:443
msgid "Current Window"
msgstr "Aktuelles Fenster"
-#: Src/wptMainProc.cpp:485
+#: Src/wptMainProc.cpp:501
msgid "Remove all passphrases from cache?"
msgstr "Alle Passwörter aus Zwischenspeicher entfernen?"
-#: Src/wptMainProc.cpp:486 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
-#: Src/wptMainProc.cpp:496
+#: Src/wptMainProc.cpp:512
msgid "Could not access public keyring, exit WinPT?"
msgstr ""
"Auf den öffentlichen Schlüsselbund kann nicht zugegriffen werden.\n"
"WinPT beenden?"
-#: Src/wptMainProc.cpp:529
+#: Src/wptMainProc.cpp:545
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4131,7 +4145,7 @@
"Stellen Sie sicher, dass das Fenster Text enthält.\n"
"%s."
-#: Src/wptMainProc.cpp:583 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "WinPT Einstellungen"
@@ -4141,7 +4155,11 @@
msgid "MAPI Login failed"
msgstr "MAPI Login fehlgeschlagen."
-#: Src/wptMAPI.cpp:140 Src/wptMAPI.cpp:263
+#: Src/wptMAPI.cpp:140
+msgid "Could not send mail."
+msgstr "Konnte E-Mail nicht versenden."
+
+#: Src/wptMAPI.cpp:263
msgid "Could not sent mail."
msgstr "Konnte E-Mail nicht versenden."
@@ -4273,7 +4291,7 @@
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
"\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Ihr Passwort sollte mindestens 8 Zeichen lang sein\n"
"und auch nicht alphabetische Zeichen enthalten.\n"
@@ -4284,7 +4302,7 @@
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Das Passwort enthält 8-bit Zeichen.\n"
"Es ist nicht zu empfehlen zeichensatzspezifische Zeichen zu benutzen."
@@ -4388,7 +4406,7 @@
#: Src/wptPreferencesDlg.cpp:222
msgid ""
"In most cases it is not a good idea to enable this setting.\n"
-"If you know what you are doing let this flag enabled, otherwise\n"
+"If you know what you are doing, you can enable this flag, otherwise\n"
"it is safe to leave this flag untouched."
msgstr ""
"Im Normalfall sollten Sie diese Funktion nicht aktivieren. Wenn Sie\n"
@@ -4570,6 +4588,15 @@
msgid "Signed"
msgstr "Signiert"
+#~ msgid "Admin PIN must be minimal 8 characters."
+#~ msgstr "Die 'Admin PIN' muss mindestens 8 Zeichen lang sein."
+
+#~ msgid "PIN must be minimal 6 characters."
+#~ msgstr "Die 'Benutzer PIN' muss mindestens 6 Zeichen lang sein."
+
+#~ msgid "Change Passwd"
+#~ msgstr "Passwort ändern"
+
#~ msgid "Edit Clipboard"
#~ msgstr "Zwischenablage bearbeiten"
Modified: trunk/Po/jp.po
===================================================================
--- trunk/Po/jp.po 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Po/jp.po 2006-07-28 11:11:09 UTC (rev 248)
@@ -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-13 09:48+0200\n"
+"POT-Creation-Date: 2006-07-28 12:57+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"
@@ -29,13 +29,13 @@
# 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:487
-#: Src/WinPT.cpp:494 Src/WinPT.cpp:534 Src/WinPT.cpp:562 Src/WinPT.cpp:571
-#: Src/WinPT.cpp:575 Src/WinPT.cpp:592 Src/WinPT.cpp:660 Src/WinPT.cpp:673
-#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
-#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:528
+#: 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
msgid "WinPT Error"
msgstr "WinPT ƒGƒ‰["
@@ -86,7 +86,7 @@
# 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:994 Src/wptKeyserver.cpp:634
+#: Src/wptKeyManagerDlg.cpp:998 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
@@ -104,17 +104,24 @@
msgid "Failed to copy the keyserver.conf"
msgstr "keyserver.conf‚̃tƒ@ƒCƒ‹ƒRƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
+#: Src/WinPT.cpp:477
+#, 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 ""
+
# c:\oss\winpt\src\WinPT.cpp:223
-#: Src/WinPT.cpp:486
+#: Src/WinPT.cpp:484
msgid "Cryptographic selftest failed."
msgstr "ˆÃ†–@ƒZƒ‹ƒtƒeƒXƒg‚ªŽ¸”s‚µ‚Ü‚µ‚½B"
-#: Src/WinPT.cpp:493
+#: Src/WinPT.cpp:491
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:535
+#: Src/WinPT.cpp:533
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -126,18 +133,18 @@
"%s."
# c:\oss\winpt\src\WinPT.cpp:246
-#: Src/WinPT.cpp:539
+#: Src/WinPT.cpp:537
msgid "Select GPG Public Keyring"
msgstr "GPGŒöŠJƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:268
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:559
#, 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:569
+#: Src/WinPT.cpp:567
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -145,12 +152,13 @@
"GPGƒoƒCƒiƒŠ(gpg.exe)‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
"GPG ƒJƒXƒ^ƒ€Ý’è‚ð‹N“®‚µ‚Ä‚±‚Ì–â‘è‚ð‰ðŒˆ‚µ‚Ü‚·‚©H"
-#: Src/WinPT.cpp:584
+#: Src/WinPT.cpp:582
+#, fuzzy
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
"\n"
-"Continue if you want that WinPT offers you more choices.\n"
+"Continue if you want WinPT to offer you more choices.\n"
msgstr ""
"”é–§‹y‚ÑŒöŠJƒL[ƒŠƒ“ƒO‚ðŒ©‚Â‚¯‚é‚Ü‚½‚̓AƒNƒZƒX‚·‚邱‚Æ‚ªo—ˆ‚Ü‚¹‚ñ‚Å‚µ‚½B\n"
"‰ðŒˆ•û–@‚ð‚í‚©‚éꇂÍAƒvƒƒOƒ‰ƒ€‚ðI—¹‚µ‚Ä’¼‚µ‚Ä‚‚¾‚³‚¢B\n"
@@ -158,23 +166,23 @@
"‚±‚Ì‚Ü‚Ü‘±‚¯‚éꇂÍAWinPT‚ª‚¢‚ë‚¢‚ë‚È‘I‘ð‚ð’ño‚µ‚Ü‚·B\n"
# c:\oss\winpt\src\WinPT.cpp:320 c:\oss\winpt\src\wptFileManagerDlg.cpp:552
-#: Src/WinPT.cpp:617 Src/wptFileManagerDlg.cpp:525
+#: Src/WinPT.cpp:615 Src/wptFileManagerDlg.cpp:525
#: Src/wptFileManagerDlg.cpp:835
msgid "Wipe Free Space"
msgstr "ŠJ‚«—̈æ‚ðŽæ‚èÁ‚·"
# c:\oss\winpt\src\WinPT.cpp:382
-#: Src/WinPT.cpp:659
+#: Src/WinPT.cpp:657
msgid "Could not register window class"
msgstr "ƒEƒBƒ“ƒh‚̃Nƒ‰ƒX‚ð“o˜^‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:395
-#: Src/WinPT.cpp:673
+#: Src/WinPT.cpp:671
msgid "Could not create window"
msgstr "ƒEƒBƒ“ƒh‚ð쬂·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\WinPT.cpp:461
-#: Src/WinPT.cpp:748
+#: Src/WinPT.cpp:746
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -183,16 +191,17 @@
"GPG‚±‚¤‚¹‚¢ (ƒL[ƒŠƒ“ƒO, ƒpƒX‚È‚Ç...) ‚ðƒ`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\WinPT.cpp:464
-#: Src/WinPT.cpp:751
+#: Src/WinPT.cpp:749
+#, fuzzy
msgid ""
-"It seems that GPG is not set properly.\n"
+"It seems that GPG is not configured properly.\n"
"Do you want to start the GPG preferences dialog?"
msgstr ""
"GPG‚ª³‚µ‚ݒ肳‚ê‚Ä‚¢‚È‚¢—l‚Å‚·B\n"
"GPGƒJƒXƒ^ƒ€Ý’è‚ðŽÀs‚µ‚Ü‚·H"
# c:\oss\winpt\src\WinPT.cpp:480
-#: Src/WinPT.cpp:769
+#: Src/WinPT.cpp:767
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -219,8 +228,8 @@
# c:\oss\winpt\src\wptAboutDlgs.cpp:78
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1152
# c:\oss\winpt\src\wptMainProc.cpp:560
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1892
-#: Src/wptMainProc.cpp:577
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
+#: Src/wptMainProc.cpp:593
msgid "About WinPT"
msgstr "WinPT‚ɂ‚¢‚Ä"
@@ -276,13 +285,13 @@
msgstr "GPG‚ɂ‚¢‚Ä..."
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1004
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:402
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
msgid "Card Manager"
msgstr "ƒJ[ƒhƒ}ƒl[ƒWƒƒ["
@@ -319,7 +328,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:284
+#: Src/wptMainProc.cpp:291
msgid "Card Edit"
msgstr "ƒJ[ƒh•ÒW"
@@ -378,9 +387,10 @@
# c:\oss\winpt\src\wptCardDlg.cpp:451
#: Src/wptCardDlg.cpp:505
+#, fuzzy
msgid ""
"This operation will override the keys on the card.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"‚±‚Ì‘€ì‚̓J[ƒhã‚É‚ ‚éƒL[‚ðŽw’è•ÏX‚µ‚Ü‚·B\n"
"‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
@@ -429,7 +439,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:1788
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
msgid "Card Key Generation"
msgstr "ƒJ[ƒhƒL[ì¬"
@@ -465,8 +475,9 @@
# 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:448
-msgid "The date you have chosen lies in the past."
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+#, fuzzy
+msgid "The date you have chosen has already passed."
msgstr "‚ ‚È‚½‚Í‘I‚΂ꂽ“ú•t‚ª‰ß‹Ž‚Ì‚à‚Ì‚Å‚·B"
# c:\oss\winpt\src\wptCardDlg.cpp:602
@@ -493,15 +504,17 @@
msgid "Please enter the new card PIN."
msgstr "V‚µ‚¢ƒJ[ƒh‚̈ÃؔԆ‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
-# c:\oss\winpt\src\wptCardDlg.cpp:639
+# c:\oss\winpt\src\wptPINDlg.cpp:69
#: Src/wptCardDlg.cpp:731
-msgid "Admin PIN must be minimal 8 characters."
-msgstr "ŠÇ—ŽÒ—pˆÃؔԆ‚Ì’·‚³‚ÍÅ’á‚W•¶Žš‚Å‚·B"
+#, fuzzy
+msgid "Admin PIN must be at least 8 characters."
+msgstr "ŠÇ—ŽÒˆÃؔԆ'Admin PIN'‚Ì’·‚³‚ÍÅ’á8•¶Žš‚Å‚·B"
-# c:\oss\winpt\src\wptCardDlg.cpp:644
+# c:\oss\winpt\src\wptPINDlg.cpp:88
#: Src/wptCardDlg.cpp:736
-msgid "PIN must be minimal 6 characters."
-msgstr "ˆÃؔԆ‚Ì’·‚³‚ÍÅ’á‚U•¶Žš‚Å‚·B"
+#, fuzzy
+msgid "PIN must be at least 6 characters."
+msgstr "ƒ†[ƒU[ˆÃؔԆ'User PIN'‚Ì’·‚³‚ÍÅ’á6•¶Žš‚Å‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
#: Src/wptCardDlg.cpp:759
@@ -646,8 +659,8 @@
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
-#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
+#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
msgid "Verify"
msgstr "Šm”F‚·‚é"
@@ -686,11 +699,12 @@
# c:\oss\winpt\src\wptClipDecryptDlg.cpp:144
#: Src/wptClipDecryptDlg.cpp:257
+#, fuzzy
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
"Do *NOT* trust any text or data output from this file!\n"
-"It is likely, the data was corrupted during the transport\n"
+"It is likely that the data was corrupted in transport\n"
"but it might be also possible that this is part of an attack."
msgstr ""
"Œx: ˆÃ†‰»‚µ‚½ƒƒbƒZ[ƒW‚ª‘€ì‚³‚ê‚Ä‚¢‚Ü‚·I\n"
@@ -715,7 +729,7 @@
#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:781 Src/wptKeyManager.cpp:971 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:801 Src/wptKeyManager.cpp:991 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "GunPG‚Ìó‘ÔFI—¹‚µ‚Ü‚µ‚½"
@@ -733,8 +747,8 @@
#: 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:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
+#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
msgid "Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh"
@@ -746,9 +760,10 @@
# c:\oss\winpt\src\wptClipEditDlg.cpp:122
#: Src/wptClipEditDlg.cpp:122
+#, fuzzy
msgid ""
"The file you want to add is very large.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"’ljÁ‚³‚ꂽ‚¢ƒtƒ@ƒCƒ‹‚ª‚Æ‚Ä‚à‘½‚«‚Å‚·B\n"
"‚»‚ê‚Å‚à‘±‚¯‚Ü‚·‚©H"
@@ -806,7 +821,7 @@
# 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:571
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
msgid "Clipboard Editor"
msgstr "ƒNƒŠƒbƒvƒ{[ƒhƒGƒfƒBƒ^["
@@ -827,8 +842,8 @@
# 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:146
-#: Src/wptMainProc.cpp:209
+#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
+#: Src/wptMainProc.cpp:216
msgid "Encryption"
msgstr "ˆÃ†‰»"
@@ -847,7 +862,7 @@
#: 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:538 Src/wptKeyRevokeDlg.cpp:79
+#: 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/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
@@ -901,7 +916,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
+#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
msgid "Signing"
msgstr "–¼"
@@ -927,7 +942,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:152 Src/wptMainProc.cpp:221
+#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
msgid "Sign & Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1080,8 +1095,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:1028
-#: Src/wptKeyManagerDlg.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1929
msgid "Key Edit"
msgstr "ƒL[‚Ì•ÒW"
@@ -1124,10 +1139,10 @@
# c:\oss\winpt\src\wptErrors.cpp:48
#: Src/wptErrors.cpp:52
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Could not find keyring entries into the options file in %s or the file does "
-"NOT exist."
+"Could not find keyring entries in the config file in %s or the file does NOT "
+"exist."
msgstr ""
"ƒIƒvƒVƒ‡ƒ“ƒtƒ@ƒCƒ‹ %s ‚ɃL[ƒŠƒ“ƒO‚ª‚ ‚è‚Ü‚¹‚ñ‚©A‚à‚µ‚‚Í‚±‚̃tƒ@ƒCƒ‹Ž©g‚ª "
"Šù‘¶‚µ‚Ü‚¹‚ñB"
@@ -1357,7 +1372,7 @@
#: 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:400 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "ƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ["
@@ -1388,9 +1403,10 @@
# c:\oss\winpt\src\wptFileManager.cpp:137
#: Src/wptFileManager.cpp:195
+#, fuzzy
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
-"them anyway and this costs a lot of time.\n"
+"them anyway and this takes a lot of time.\n"
"It is possible to disable compression for these files.\n"
"Do you want to disable it?"
msgstr ""
@@ -1467,8 +1483,8 @@
# 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:197
-#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:417
+#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
msgid "Sign"
msgstr "–¼"
@@ -1476,7 +1492,7 @@
# 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:409 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
msgid "Encrypt"
msgstr "ŒöŠJˆÃ†‰»"
@@ -1490,7 +1506,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:408 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
msgid "Symmetric"
msgstr "‹¤’ʈƉ»"
@@ -1622,8 +1638,8 @@
# c:\oss\winpt\src\wptFileManager.cpp:1327
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1106
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1138
-#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1852
-#: Src/wptKeyManagerDlg.cpp:1884
+#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1897
msgid "Choose Name for Key File"
msgstr "ƒL[ƒtƒ@ƒCƒ‹‚É–¼‘O‚ð‘I‘ð‚·‚éB"
@@ -1711,7 +1727,7 @@
# 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:992
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Options"
msgstr "ƒIƒvƒVƒ‡ƒ“"
@@ -1741,7 +1757,7 @@
# c:\oss\winpt\src\wptOwnertrustDlg.cpp:41
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "ƒtƒ@ƒCƒ‹"
@@ -1801,11 +1817,11 @@
# c:\oss\winpt\src\wptKeyserverSearchDlg.cpp:115
#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:701 Src/wptKeyManager.cpp:802
-#: Src/wptKeyManager.cpp:836 Src/wptKeyManagerDlg.cpp:1665
-#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeyManagerDlg.cpp:1709
-#: Src/wptKeyManagerDlg.cpp:1720 Src/wptKeyManagerDlg.cpp:1735
-#: Src/wptKeyManagerDlg.cpp:1842 Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManager.cpp:721 Src/wptKeyManager.cpp:822
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1678
+#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "ƒL[‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
@@ -1820,18 +1836,18 @@
msgstr "%d ƒIƒuƒWƒFƒNƒg‚ªƒ}[ƒN‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:350
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:541
+#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
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:966
-#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptMainProc.cpp:405
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptMainProc.cpp:421
msgid "Edit"
msgstr "•ÒW"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
msgid "View"
msgstr "ƒrƒ…["
@@ -1847,8 +1863,8 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:357
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:574
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Sign"
msgstr "–¼(&S)"
@@ -1856,7 +1872,7 @@
# 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:411 Src/wptMainProc.cpp:415
+#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
msgid "Sign && Encrypt"
msgstr "–¼‹y‚шƉ»"
@@ -1883,7 +1899,7 @@
# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
# c:\oss\winpt\src\wptMainProc.cpp:400
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:407
+#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
msgid "Exit"
msgstr "I—¹"
@@ -1961,11 +1977,11 @@
msgid "Are you sure you want to secure delete these files?"
msgstr "–{“–‚É‚±‚ê‚ç‚̃tƒ@ƒCƒ‹‚ðˆÀ‘S휂µ‚Ü‚·‚©Hn"
-#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:102
+#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
msgid "&Yes"
msgstr "‚Í‚¢(&Y)"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:103
+#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
msgid "&No"
msgstr "‚¢‚¢‚¦(&N)"
@@ -2049,7 +2065,7 @@
msgstr "WinPTʼn‚̃Xƒ^[ƒg"
# c:\oss\winpt\src\wptGPG.cpp:734
-#: Src/wptGPG.cpp:839
+#: Src/wptGPG.cpp:830
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -2060,23 +2076,23 @@
"‚±‚Ì‘®«‚ð휂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:737
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:833
msgid "GPG Information"
msgstr "GPGƒCƒ“ƒtƒH"
# c:\oss\winpt\src\wptGPG.cpp:741
-#: Src/wptGPG.cpp:846
+#: Src/wptGPG.cpp:837
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:847 Src/wptGPG.cpp:1130 Src/wptGPG.cpp:1139
+#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
msgid "GPG Error"
msgstr "GPGƒGƒ‰["
# c:\oss\winpt\src\wptGPG.cpp:757
-#: Src/wptGPG.cpp:859
+#: Src/wptGPG.cpp:850
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -2091,7 +2107,7 @@
"ƒvƒƒOƒ‰ƒ€‚ª‚»‚ê‚ðŠJ‚¢‚½‚½‚ß‚Æl‚¦‚ç‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptGPG.cpp:762
-#: Src/wptGPG.cpp:864
+#: Src/wptGPG.cpp:855
msgid "GPG Warning"
msgstr "GPGŒx"
@@ -2115,12 +2131,12 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:270
# c:\oss\winpt\src\wptPreferencesDlg.cpp:317
# c:\oss\winpt\src\wptRegistry.cpp:492
-#: Src/wptGPG.cpp:888 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
+#: 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:993
-#: Src/wptMainProc.cpp:428 Src/wptPreferencesDlg.cpp:225
+#: 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
@@ -2128,7 +2144,7 @@
msgstr "ƒJƒXƒ^ƒ€Ý’è"
# c:\oss\winpt\src\wptGPG.cpp:783
-#: Src/wptGPG.cpp:889
+#: Src/wptGPG.cpp:880
#, c-format
msgid ""
"%s does not exit.\n"
@@ -2138,63 +2154,63 @@
"‚±‚̃fƒBƒŒƒNƒgƒŠ[‚ð쬂µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptGPG.cpp:863
-#: Src/wptGPG.cpp:917
+#: Src/wptGPG.cpp:908
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:920 Src/wptGPG.cpp:942
+#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
msgid "No keyring was chosen. Exit."
msgstr "ƒL[ƒŠƒ“ƒO‚ª‘I‘ð‚³‚ê‚Ä‚Ü‚¹‚ñBI—¹B"
# c:\oss\winpt\src\wptGPG.cpp:872
-#: Src/wptGPG.cpp:927
+#: Src/wptGPG.cpp:918
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:933 Src/wptGPG.cpp:954
+#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
msgid "Could not copy file."
msgstr "ƒtƒ@ƒCƒ‹‚ðƒRƒs[‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPG.cpp:883
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:930
msgid "Please choose your Secret Keyring"
msgstr "”é–§ƒL[ƒŠƒ“ƒO‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:891
-#: Src/wptGPG.cpp:948
+#: Src/wptGPG.cpp:939
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:998 Src/wptGPG.cpp:1089 Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
msgid "Backup"
msgstr "ƒoƒbƒNƒAƒbƒv"
# c:\oss\winpt\src\wptGPG.cpp:942
-#: Src/wptGPG.cpp:998
+#: Src/wptGPG.cpp:989
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "ˆÈ‰º‚̃oƒbƒNƒAƒbƒvƒL[ƒŠƒ“ƒO‚ª \"%s\" Ž¸”s‚µ‚Ü‚µ‚½B"
-#: Src/wptGPG.cpp:1090
-#, c-format
+#: Src/wptGPG.cpp:1079
+#, fuzzy, c-format
msgid ""
-"The backup drive '%s' does not seems to accessable.\n"
+"The backup drive '%s' does not seems to be accessable.\n"
"Please insert/check the drive to continue."
msgstr ""
"ŽŸ‚̃oƒbƒNƒAƒbƒvƒhƒ‰ƒCƒu '%s' ‚ªŽg—p‚©‚Ì‚¤‚Å‚Í‚È‚¢‚Ý‚½‚¢‚Å‚·B\n"
"‘±‚¯‚é‚̂Ƀhƒ‰ƒCƒu‚ð‘}“ü‚Ü‚½‚̓`ƒFƒbƒN‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptGPG.cpp:1004
-#: Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:1091
#, 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:1129
+#: Src/wptGPG.cpp:1118
msgid "No GPG error description available."
msgstr "GPGƒGƒ‰[‚ÌÚׂ͂ ‚è‚Ü‚¹‚ñB"
@@ -2238,14 +2254,14 @@
msgstr "—LŒø‚È–¼i–³Œø‚ȃL[j"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:44
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:97
+#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
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:69 Src/wptGPGOptDlg.cpp:75
-#: Src/wptGPGOptDlg.cpp:80 Src/wptGPGOptDlg.cpp:84 Src/wptGPGOptDlg.cpp:91
-#: Src/wptGPGOptDlg.cpp:97
+#: 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
msgid "GPG Config"
msgstr "GPG‚±‚¤‚¹‚¢"
@@ -2260,28 +2276,35 @@
msgid "&Load"
msgstr "ƒ[ƒh(&L)"
+# c:\oss\winpt\src\wptFileManagerDlg.cpp:364
+# c:\oss\winpt\src\wptMainProc.cpp:400
+#: Src/wptGPGOptDlg.cpp:57
+#, fuzzy
+msgid "&Exit"
+msgstr "I—¹"
+
# c:\oss\winpt\src\wptGPGOptDlg.cpp:68
-#: Src/wptGPGOptDlg.cpp:69
+#: Src/wptGPGOptDlg.cpp:70
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:75
+#: Src/wptGPGOptDlg.cpp:76
msgid "File contains invalid GnuPG keywords!"
msgstr "ƒtƒ@ƒCƒ‹‚É–³Œø‚ÈGnuPGƒL[ƒ[ƒh‚ª“ü‚Á‚Ä‚¢‚Ü‚·I"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:44
-#: Src/wptGPGOptDlg.cpp:80
+#: Src/wptGPGOptDlg.cpp:81
msgid "Could not save GnuPG config file."
msgstr "GnuPG‚±‚¤‚¹‚¢ƒtƒ@ƒCƒ‹‚ð•Û‘¶‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:83
-#: Src/wptGPGOptDlg.cpp:84
+#: Src/wptGPGOptDlg.cpp:85
msgid "Successfully saved."
msgstr "³‚µ‚•Û‘¶‚³‚ê‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:89
-#: Src/wptGPGOptDlg.cpp:90
+#: Src/wptGPGOptDlg.cpp:91
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -2292,8 +2315,8 @@
# 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:1814
-#: Src/wptMainProc.cpp:589
+#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:605
msgid "GnuPG Preferences"
msgstr "GnuPGƒJƒXƒ^ƒ€Ý’è"
@@ -2466,27 +2489,27 @@
#: Src/wptKeyManager.cpp:440 Src/wptKeyManager.cpp:443
#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:454
#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:587
-#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:701
-#: Src/wptKeyManager.cpp:729 Src/wptKeyManager.cpp:738
-#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:775
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:807
-#: Src/wptKeyManager.cpp:831 Src/wptKeyManager.cpp:836
-#: Src/wptKeyManager.cpp:850 Src/wptKeyManager.cpp:907
-#: Src/wptKeyManager.cpp:912 Src/wptKeyManager.cpp:969
-#: Src/wptKeyManager.cpp:1002 Src/wptKeyManager.cpp:1086
-#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
-#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1643
-#: Src/wptKeyManagerDlg.cpp:1666 Src/wptKeyManagerDlg.cpp:1681
-#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1699
-#: Src/wptKeyManagerDlg.cpp:1709 Src/wptKeyManagerDlg.cpp:1720
-#: Src/wptKeyManagerDlg.cpp:1735 Src/wptKeyManagerDlg.cpp:1752
-#: Src/wptKeyManagerDlg.cpp:1784 Src/wptKeyManagerDlg.cpp:1843
-#: Src/wptKeyManagerDlg.cpp:1861 Src/wptKeyManagerDlg.cpp:1866
-#: Src/wptKeyManagerDlg.cpp:1871 Src/wptKeyManagerDlg.cpp:1942
-#: Src/wptKeyManagerDlg.cpp:1947 Src/wptKeyManagerDlg.cpp:2060
+#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:721
+#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:758
+#: Src/wptKeyManager.cpp:769 Src/wptKeyManager.cpp:795
+#: Src/wptKeyManager.cpp:822 Src/wptKeyManager.cpp:827
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:932 Src/wptKeyManager.cpp:989
+#: Src/wptKeyManager.cpp:1022 Src/wptKeyManager.cpp:1106
+#: 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/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:401 Src/wptMainProc.cpp:552 Src/wptMainProc.cpp:560
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
msgid "Key Manager"
msgstr "ƒL[ƒ}ƒl[ƒWƒƒ["
@@ -2631,7 +2654,7 @@
# 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:910 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
@@ -2642,7 +2665,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:913 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:916 Src/wptKeyserverSearchDlg.cpp:54
msgid "Size"
msgstr "ƒTƒCƒY"
@@ -2653,8 +2676,8 @@
# 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:911
-#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
@@ -2667,22 +2690,23 @@
# 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:917 Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
#: 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:912 Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
msgid "Type"
msgstr "Ží—Þ"
# c:\oss\winpt\src\wptImportList.cpp:216
#: Src/wptImportList.cpp:419
+#, fuzzy
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
-"and thus a CRC error occurs."
+"and thus causing a CRC error."
msgstr ""
"CRCƒGƒ‰[‚ª”¶‚µ‚Ä‚¢‚Ü‚·B\n"
"ASCII-Armor‚̓_ƒ[ƒW‚ªŽó‚¯‚Ä‚¢‚é‚©‚Ì‚¤‚¹‚¢‚ª‚ ‚è‚Ü‚·B"
@@ -2743,10 +2767,11 @@
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:223
#: Src/wptKeyEditDlgs.cpp:356
+#, fuzzy
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
-"close to 240x288 is a good size to use."
+"close to 240x288 is advised."
msgstr ""
"‰æ‘œ‚à‚ ‚È‚½‚ÌŒöŠJŒ®‚ƈê‚É•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚·B‚Æ‚Ä‚à‘½‚«‰æ‘œ‚ðŽg—p‚·‚é‚Æ‚ ‚È"
"‚½‚̃L[‚àd‚½‚‚È‚è‚Ü‚·I‰æ‘œ‚Ì‘å‚«‚³‚ð240x288‚®‚ç‚¢‚É‚µ‚½‚Ù‚¤‚ª—Ç‚¢‚ÆŽv‚¢‚Ü"
@@ -2837,8 +2862,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:490
-#: Src/wptKeygenDlg.cpp:591 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
+#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "GnuPG‚Ìó‘Ô"
@@ -2995,7 +3020,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:1698
+#: Src/wptKeyManagerDlg.cpp:1711
msgid "There is no secret key available!"
msgstr "”é–§Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
@@ -3043,17 +3068,19 @@
msgstr "V‚µ‚¢ƒpƒXƒtƒŒ[ƒY"
#: Src/wptKeyEditDlgs.cpp:1037
+#, fuzzy
msgid ""
"Are you sure that you really don't want a passphrase?\n"
-"This is propably a bad idea, still proceed?"
+"This is propably a bad idea, continue?"
msgstr ""
"ƒpƒXƒtƒŒ[ƒX‚ð–{“–‚É‚¢‚è‚Ü‚¹‚ñ‚©?\n"
"‚±‚ê‚Í‚ ‚Ü‚è—Ç‚¢‘I‘ð‚Å‚Í‚ ‚è‚Ü‚¹‚ñB‚Ü‚¾‘±‚¯‚Ü‚·‚©?"
-# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
+# c:\oss\winpt\src\wptKeyPropsDlg.cpp:116
#: Src/wptKeyEditDlgs.cpp:1053
-msgid "Change Passwd"
-msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
+#, fuzzy
+msgid "Change Password"
+msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX(&P)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:791
#: Src/wptKeyEditDlgs.cpp:1055
@@ -3061,7 +3088,7 @@
msgstr "ƒpƒXƒtƒŒ[ƒY‚Ì•ÏX‚ͳ‚µ‚‚Å‚«‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:806
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
msgid "Description"
msgstr "Ú×"
@@ -3073,7 +3100,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:915
+#: Src/wptKeyManagerDlg.cpp:918
msgid "Validity"
msgstr "—LŒø«"
@@ -3089,7 +3116,7 @@
"ADDUID add a user ID\r\n"
"ADDPHOTO add a photo ID\r\n"
"DELUID delete a user ID\r\n"
-"ADDKEY add a secondard key\r\n"
+"ADDKEY add a secondary key\r\n"
"DELKEY delete a secondary key\r\n"
"ADDREVOKER add a revocation key\r\n"
"EXPIRE change the expire date\r\n"
@@ -3346,14 +3373,14 @@
msgstr "ƒL[‚𖼂·‚邱‚ƂɬŒ÷‚µ‚Ü‚µ‚½B"
#: Src/wptKeyEditDlgs.cpp:2057
-#, c-format
+#, fuzzy, c-format
msgid ""
"Your keys is listed as a designated revoker for the key\n"
"\n"
"%s\n"
"\n"
"Are you sure you want to create a revocation certificate\n"
-"which allow to revoke the key listed above?"
+"which allows you to revoke the key listed above?"
msgstr ""
"‚ ‚È‚½‚̃L[‚ÍŒø‰»‚·‚éƒL[‚ÆŽw’肳‚ê‚Ä‚¢‚Ü‚·\n"
"\n"
@@ -3423,10 +3450,11 @@
# c:\oss\winpt\src\wptKeyEditOwnertrustDlg.cpp:66
#: Src/wptKeyEditOwnertrustDlg.cpp:63
+#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys (by looking at passports, checking fingerprint from different "
-"source...)?"
+"sources...)?"
msgstr ""
"‚Ù‚©‚̃†[ƒU[‚̃L[‚𳂵‚Šm”F‚·‚é‚Ì‚ÉA‚±‚̃†[ƒU[‚ð‚Ç‚Ì‚®‚ç‚¢M—p‚µ‚Ä‚¢"
"‚é‚©‚ðŒˆ‚ß‚Ä‚‚¾‚³‚¢B (ƒpƒXƒ|[ƒg‚ðŒ©‚½‚èA‚¢‚ë‚¢‚ë‚È‚Æ‚±‚ë‚©‚ç‚̃tƒBƒ“ƒK["
@@ -3447,8 +3475,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:973
-#: Src/wptKeyManagerDlg.cpp:1908 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -3482,11 +3510,11 @@
# 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:405 Src/wptKeygenDlg.cpp:410
-#: Src/wptKeygenDlg.cpp:415 Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:427
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:449 Src/wptKeygenDlg.cpp:456
-#: Src/wptKeygenDlg.cpp:466 Src/wptKeygenDlg.cpp:487 Src/wptKeygenDlg.cpp:570
-#: Src/wptKeyManagerDlg.cpp:1775 Src/wptPassphraseDlg.cpp:147
+#: 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/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "ƒL[‚Ìì¬"
@@ -3562,9 +3590,10 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:144
#: Src/wptKeygenDlg.cpp:373
+#, fuzzy
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
-"message that key generation was finished."
+"message that key generation has finished."
msgstr ""
"’ˆÓF ƒL[‚Ì쬂͂·‚²‚’·‚¢ŽžŠÔ‚©‚©‚è‚Ü‚·IƒL[쬂ªI—¹‚µ‚Ü‚µ‚½‚Æ‚¢‚¤ƒƒb"
"ƒZ[ƒW‚ª‚Ђ傤‚¶‚·‚é‚Ü‚Å‚¨‘Ò‚¿‚‚¾‚³‚¢B"
@@ -3585,69 +3614,69 @@
msgstr "ƒL[‚ÌŽí—Þ(&T)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:189
-#: Src/wptKeygenDlg.cpp:404
+#: Src/wptKeygenDlg.cpp:415
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:409
+#: Src/wptKeygenDlg.cpp:420
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:415 Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
msgid "Please enter the name."
msgstr "–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:382
-#: Src/wptKeygenDlg.cpp:419 Src/wptKeygenDlg.cpp:552
+#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
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:426 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
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:434
+#: Src/wptKeygenDlg.cpp:445
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:465 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:476 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:490 Src/wptKeygenDlg.cpp:591
+#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
msgid "Key Generation completed"
msgstr "ƒL[‚Ì쬂ªŠ®—¹‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:354
-#: Src/wptKeygenDlg.cpp:531
+#: Src/wptKeygenDlg.cpp:542
msgid "&Prefer RSA keys"
msgstr "RSAƒL[‚ð—Dæ‚·‚é(&P)"
# c:\oss\winpt\src\wptKeygenDlg.cpp:355
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:543
msgid "Real name:"
msgstr "³Ž®–¼"
# c:\oss\winpt\src\wptKeygenDlg.cpp:356
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:544
msgid "Email address:"
msgstr "ƒ[ƒ‹ƒAƒhƒŒƒXF"
# c:\oss\winpt\src\wptKeygenDlg.cpp:357
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:545
msgid "Name and E-Mail Assignment"
msgstr "–¼‘O‚ƃ[ƒ‹‚ÌŽw’è"
# c:\oss\winpt\src\wptKeygenDlg.cpp:358
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:546
#, fuzzy
msgid ""
"Every key pair must have a name associated with it. The name and\n"
@@ -3659,7 +3688,7 @@
"Ž„‚½‚¿‚Ì‚à‚Ì‚Å‚ ‚邱‚Æ‚ð”FŽ¯‚µ‚Ü‚·B"
# c:\oss\winpt\src\wptKeygenDlg.cpp:359
-#: Src/wptKeygenDlg.cpp:536
+#: Src/wptKeygenDlg.cpp:547
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
"assist your correspondents in selecting the correct public\n"
@@ -3672,14 +3701,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:537 Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:553
-#: Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:566 Src/wptKeygenDlg.cpp:587
-#: Src/wptKeyManagerDlg.cpp:1798
+#: 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
msgid "Key Generation Wizard"
msgstr "ƒL[쬂̃EƒBƒU[ƒh"
# c:\oss\winpt\src\wptGroupsDlg.cpp:65
-#: Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr "“dŽqƒ[ƒ‹ƒAƒhƒŒƒX‚É'<' ‚Ü‚½‚Í '>'‚ð’ljÁ‚È‚¢‚Å‚‚¾‚³‚¢B"
@@ -3782,14 +3811,14 @@
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:914
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
+#: Src/wptKeyManagerDlg.cpp:1007
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:916
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "M—p"
@@ -3880,8 +3909,9 @@
# c:\oss\winpt\src\wptKeyManager.cpp:416
#: Src/wptKeyManager.cpp:452
+#, fuzzy
msgid ""
-"The key you want to import is dash escacped.\n"
+"The key you want to import is dash escaped.\n"
"Do you want to extract the key?"
msgstr ""
"ƒCƒ“ƒ|[ƒg‚³‚ꂽ‚¢ƒL[‚ªƒ_ƒVƒ…ƒGƒXƒP[ƒv‚Å‚·B\n"
@@ -3940,16 +3970,16 @@
msgstr "ƒL[‚̃f[ƒ^‚ðƒtƒ@ƒCƒ‹‚©‚ç“Ç‚Þ‚±‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:726
msgid "Do you really want to confirm each key?"
msgstr "‚·‚ׂẴL[‚ð–{“–‚ÉŠm”F‚µ‚½‚¢‚Å‚·‚©H"
-#: Src/wptKeyManager.cpp:707
+#: Src/wptKeyManager.cpp:727
msgid "Delete Confirmation"
msgstr "Šm”F‚ð휂·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:750
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -3961,7 +3991,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:577
-#: Src/wptKeyManager.cpp:739
+#: Src/wptKeyManager.cpp:759
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -3979,7 +4009,7 @@
"%s"
# c:\oss\winpt\src\wptKeyManager.cpp:585
-#: Src/wptKeyManager.cpp:746
+#: Src/wptKeyManager.cpp:766
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3990,86 +4020,86 @@
"휂³‚ê‚Ü‚·B\n"
# c:\oss\winpt\src\wptKeyManager.cpp:636
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828
#, c-format
msgid "Do you really want to send '0x%s' to keyserver %s?"
msgstr "'0x%s' ‚ð–{“–‚ɃL[ƒT[ƒo[ %s ‚É‘—M‚µ‚½‚¢‚Å‚·‚©H"
# c:\oss\winpt\src\wptKeyManager.cpp:661
-#: Src/wptKeyManager.cpp:830
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "‚ЂƂ‚̃L[‚¾‚¯‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManager.cpp:733
-#: Src/wptKeyManager.cpp:906
+#: Src/wptKeyManager.cpp:926
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:911
+#: Src/wptKeyManager.cpp:931
msgid "Could not connect to keyserver, abort procedure."
msgstr "ƒL[ƒT[ƒo[‚ÉÚ‘±‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B’†Ž~‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search"
msgstr "ŒŸõ"
# c:\oss\winpt\src\wptKeyserverDlg.cpp:304
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search for:"
msgstr "ŒŸõ‚·‚邱‚ÆF"
-#: Src/wptKeyManager.cpp:997
+#: Src/wptKeyManager.cpp:1017
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "ŽŸ‚Ì•¶Žšƒpƒ^[ƒ“‚ª\"%s\" Œ©‚‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:74
-#: Src/wptKeyManager.cpp:1063 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1083 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. ——R‚Í–¾Ž¦‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:75
-#: Src/wptKeyManager.cpp:1064 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1084 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:1065 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. ƒL[‚Í”pŽ~‚³‚ê‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:77
-#: Src/wptKeyManager.cpp:1066 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1086 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:486 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
msgid "Paste Key from Clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:507
+#: Src/wptKeyManagerDlg.cpp:508
#, c-format
msgid "Default Key: %s"
msgstr "‹K’èƒL[‚Í: %s"
# c:\oss\winpt\src\wptKeyManager.cpp:805
-#: Src/wptKeyManagerDlg.cpp:509
+#: Src/wptKeyManagerDlg.cpp:510
#, c-format
msgid "Default Key: 0x%s"
msgstr "‹K’èƒL[‚Í: 0x%s"
# c:\oss\winpt\src\wptImportList.cpp:55
-#: Src/wptKeyManagerDlg.cpp:530
+#: Src/wptKeyManagerDlg.cpp:532
#, c-format
msgid "%d secret keys"
msgstr "%d ӎФΨ"
-#: Src/wptKeyManagerDlg.cpp:531
+#: Src/wptKeyManagerDlg.cpp:533
#, c-format
msgid "%d keys"
msgstr "%d ƒL["
@@ -4080,71 +4110,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:968
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Key"
msgstr "ƒL["
# c:\oss\winpt\src\wptGroupsDlg.cpp:49
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1180
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
+#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
msgid "Groups"
msgstr "ƒOƒ‹[ƒv"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Send Mail..."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚é..."
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Copy\tCtrl+C"
msgstr "ƒRƒs[(&C)\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Paste\tCtrl+V"
msgstr "‚Í‚è•t‚¯(&P)\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Search...\tCtrl+F"
msgstr "ŒŸõ...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Select All\tCtrl+A"
msgstr "‚·‚ׂČŸõ\tCtrl+A"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:569
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Quit"
msgstr "I—¹(&Q)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:571
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:984
msgid "&Expert"
msgstr "ƒGƒNƒXƒp[ƒg(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:572
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:985
msgid "&Normal"
msgstr "•’Ê(&N)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:575
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Delete"
msgstr "íœ(&D)"
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
msgid "&Revoke Cert"
msgstr "Ø–¾‘‚𖳌ø‰»‚·‚é(&R)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:577
-#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
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:988 Src/wptKeyManagerDlg.cpp:1715
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "ƒgƒ‰ƒXƒgƒpƒXˆê——‚Ђ傤"
@@ -4152,112 +4182,118 @@
# c:\oss\winpt\src\wptFileManager.cpp:1309
# c:\oss\winpt\src\wptFileManager.cpp:1335
# c:\oss\winpt\src\wptKeyserverDlg.cpp:79
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:993
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:990
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Import..."
msgstr "ƒCƒ“ƒ|[ƒg...(&I)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:579
# c:\oss\winpt\src\wptKeysigDlg.cpp:334
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "‘®«(&P)"
# c:\oss\winpt\src\wptKeylist.cpp:923
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:999
msgid "E&xport Secret Key"
msgstr "”é–§Œ®‚ðƒGƒLƒXƒ|[ƒg‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:583
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Re&load Key Cache"
msgstr "ƒL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚·‚é(&L)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:584
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "R&everify Signatures"
msgstr "–¼‚ðÄŠm”F‚·‚é(&E)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1002
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:999 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "ƒo[ƒWƒ‡ƒ“î•ñ"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:761
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy User ID to Clipboard"
msgstr "ƒ†[ƒU[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key ID to Clipboard"
msgstr "ƒL[ID‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:1024
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:1021
+#: Src/wptKeyManagerDlg.cpp:1025
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:1022
+#: Src/wptKeyManagerDlg.cpp:1026
+#, fuzzy
+msgid "Copy E-Mail to Clipboard"
+msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
+
+# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Copy Key to Clipboard"
msgstr "ƒL[‚ðƒNƒŠƒbƒvƒ{[ƒh‚É“]‘—‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "Refresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1030
msgid "Set Implicit &Trust"
msgstr "ˆÃ–ÙM—p‚ðÝ’è‚·‚é(&T)"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:396
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "&Enable"
msgstr "—LŒø‚·‚é(&E)"
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "&Disable"
msgstr "–³Œø‚·‚é(&D)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Re&fresh from Keyserver"
msgstr "ƒL[ƒT[ƒo[‚æ‚èXV‚·‚é(&F)"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:764
-#: Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set preferred Keyserver URL"
msgstr "Šó–]‚·‚éƒL[ƒT[ƒo[‚ÌURL‚ðÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Send Key to Mail Recipient"
msgstr "ƒL[‚ðƒ[ƒ‹‚ÌŽóMŽÒ‚É‘—M‚·‚é"
# c:\oss\winpt\src\wptKeyManager.cpp:803
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Set as Default Key"
msgstr "‹K’èƒL[‚Æ‚µ‚ÄÝ’è‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Key..."
msgstr "ƒL[..."
@@ -4267,24 +4303,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:1040
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "User ID..."
msgstr "ƒ†[ƒU[ID"
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Photo ID..."
msgstr "ƒtƒHƒgID..."
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:115
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Revoker..."
msgstr "–³Œø‰»‚«‚Ì‚¤"
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Key Attributes"
msgstr "ƒL[‚Ì‘®«"
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1051
msgid "Add"
msgstr "’ljÁ"
@@ -4303,11 +4339,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:1047
+#: Src/wptKeyManagerDlg.cpp:1052
msgid "Send to Keyserver"
msgstr "ƒL[ƒT[ƒo[‚É‘—M‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1323
+#: Src/wptKeyManagerDlg.cpp:1335
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -4316,66 +4352,66 @@
"‚È‚‚Ä‚àˆê‚‚̃L[‚ðÅ‚M—pŽÒƒL[‚Æ‚µ‚Äݒ肵‚Ä‚‚¾‚³‚¢B"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:765
-#: Src/wptKeyManagerDlg.cpp:1352
+#: Src/wptKeyManagerDlg.cpp:1364
msgid "&Show"
msgstr "‚Ђ傤‚¶(&S)"
# c:\oss\winpt\src\wptFileManagerDlg.cpp:354
-#: Src/wptKeyManagerDlg.cpp:1353
+#: Src/wptKeyManagerDlg.cpp:1365
msgid "&New..."
msgstr "ŠJ‚(&N)..."
# c:\oss\winpt\src\wptFirstRunDlg.cpp:42
-#: Src/wptKeyManagerDlg.cpp:1464
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "Generate new key pair"
msgstr "V‚µ‚¢ƒL[ƒyƒA‚ð쬂·‚é"
-#: Src/wptKeyManagerDlg.cpp:1468
+#: Src/wptKeyManagerDlg.cpp:1481
msgid "Search for a specific key"
msgstr "“Á’è‚ȃL[‚ðƒT[ƒ`‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:724
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1485
msgid "Delete key from keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚©‚çƒL[‚ð휂·‚éB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:728
-#: Src/wptKeyManagerDlg.cpp:1476
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Show key properties"
msgstr "ƒL[‚Ì‘®«‚ðŒ©‚¹‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:732
-#: Src/wptKeyManagerDlg.cpp:1480
+#: Src/wptKeyManagerDlg.cpp:1493
msgid "Sign key"
msgstr "ƒVƒOƒjƒ`ƒƒ[ƒL["
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:762
-#: Src/wptKeyManagerDlg.cpp:1484
+#: Src/wptKeyManagerDlg.cpp:1497
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:1488
+#: Src/wptKeyManagerDlg.cpp:1501
msgid "Paste key from clipboard"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚©‚çƒL[‚ð‚Í‚è•t‚¯‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:736
-#: Src/wptKeyManagerDlg.cpp:1492
+#: Src/wptKeyManagerDlg.cpp:1505
msgid "Import key to keyring"
msgstr "ƒL[ƒŠƒ“ƒO‚ɃL[‚ðƒCƒ“ƒ|[ƒg‚·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:740
-#: Src/wptKeyManagerDlg.cpp:1496
+#: Src/wptKeyManagerDlg.cpp:1509
msgid "Export key to a file"
msgstr "ƒL[‚ðƒtƒ@ƒCƒ‹‚ɃGƒLƒXƒ|[ƒg‚Æ‚·‚é"
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeyManagerDlg.cpp:1643
msgid "New"
msgstr "V‹Kì¬"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:869
-#: Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1655
msgid "Could not access public keyring"
msgstr "ŒöŠJƒL[ƒŠƒ“ƒO‚ðƒAƒNƒZƒX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -4387,7 +4423,7 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:318
# c:\oss\winpt\src\wptKeysignDlg.cpp:320
# c:\oss\winpt\src\wptKeysignDlg.cpp:322
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeysignDlg.cpp:325
+#: 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
@@ -4395,7 +4431,7 @@
msgstr "ƒL[‚𖼂·‚é"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:926
-#: Src/wptKeyManagerDlg.cpp:1690
+#: Src/wptKeyManagerDlg.cpp:1703
msgid "Key already revoked!"
msgstr "ƒL[‚ª‚·‚Å‚É–³Œø‚Æ‚È‚Á‚Ä‚¢‚Ü‚·B"
@@ -4406,7 +4442,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:1704 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1717 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
@@ -4415,18 +4451,18 @@
msgstr "ƒL[‚Ì–³Œø‰»Ø–¾‘"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptKeyManagerDlg.cpp:1739
msgid "Key Signature List"
msgstr "ƒL[–¼‚̈ꗗ‚Ђ傤"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:992
# c:\oss\winpt\src\wptKeyPropsDlg.cpp:113
-#: Src/wptKeyManagerDlg.cpp:1743 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "ƒL[‚Ì‘®«"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1007
-#: Src/wptKeyManagerDlg.cpp:1753
+#: Src/wptKeyManagerDlg.cpp:1766
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -4435,34 +4471,34 @@
"–{“–‚ɃL[ƒLƒƒƒbƒVƒ…‚ðƒŠƒ[ƒh‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1045
-#: Src/wptKeyManagerDlg.cpp:1783
+#: Src/wptKeyManagerDlg.cpp:1796
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:1806 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
msgid "Keyserver Access"
msgstr "ƒL[ƒT[ƒo[‚̃AƒNƒZƒX"
# c:\oss\winpt\src\wptGPGOptDlg.cpp:46
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1077
-#: Src/wptKeyManagerDlg.cpp:1823
+#: Src/wptKeyManagerDlg.cpp:1836
msgid "GnuPG Options"
msgstr "GnuPGƒIƒvƒVƒ‡ƒ“"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1119
-#: Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "There is no corresponding secret key for this key."
msgstr "‚±‚̃L[‚ɑ΂µ‚Ă̔閧Œ®‚ª‚ ‚è‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1124
-#: Src/wptKeyManagerDlg.cpp:1870
+#: Src/wptKeyManagerDlg.cpp:1883
msgid "You can only export one secret key."
msgstr "ˆêŒÂ‚̔閧Œ®‚µ‚©ƒGƒLƒXƒ|[ƒg‚Å‚«‚Ü‚¹‚ñB"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1128
-#: Src/wptKeyManagerDlg.cpp:1875
+#: Src/wptKeyManagerDlg.cpp:1888
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -4481,17 +4517,17 @@
"‚±‚̃L[‚ð–{“–‚ɃGƒLƒXƒ|[ƒg‚µ‚Ü‚·‚©H"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1133
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptKeyManagerDlg.cpp:1893
msgid "WARNING"
msgstr "Œx"
# c:\oss\winpt\src\wptKeyManagerDlg.cpp:1205
-#: Src/wptKeyManagerDlg.cpp:1941
+#: Src/wptKeyManagerDlg.cpp:1954
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:1946
+#: Src/wptKeyManagerDlg.cpp:1959
msgid "Keyserver refresh finished."
msgstr "ƒL[ƒT[ƒo[‚̃ŠƒtƒŒƒbƒVƒ…‚ªŠ®—¹‚µ‚Ü‚µ‚½B"
@@ -4610,8 +4646,9 @@
# c:\oss\winpt\src\wptKeyRevokeDlg.cpp:69
#: Src/wptKeyRevokeDlg.cpp:134
+#, fuzzy
msgid ""
-"Please move this certificate to a medium where it can bestored in a safe "
+"Please move this certificate to a medium where it can be stored in a safe "
"place (floppy, CDR, etc..).\n"
"If an attacker gets access to this certificate he can use it to render your "
"key unusable!"
@@ -4695,7 +4732,7 @@
#: Src/wptKeyserver.cpp:678
#, fuzzy
msgid ""
-"Invalid proxy configuration.You need to set a user and a password to use "
+"Invalid proxy configuration. You need to set a user and a password to use "
"proxy authentication!"
msgstr ""
"–³Œø‚ȃvƒƒNƒV[‚±‚¤‚¹‚¢Bƒ†[ƒU[–¼‹y‚уpƒXƒ[ƒh‚ðÝ’è‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B"
@@ -4929,7 +4966,8 @@
# c:\oss\winpt\src\wptKeyserverDlg.cpp:302
#: Src/wptKeyserverDlg.cpp:582
-msgid "Please enter the key ID or email address you search for"
+#, 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
@@ -5187,7 +5225,8 @@
# c:\oss\winpt\src\wptKeysignDlg.cpp:157
#: Src/wptKeysignDlg.cpp:232
-msgid "(3) I have done very careful checkings."
+#, fuzzy
+msgid "(3) I have done very careful checking."
msgstr "(3) Td‚Ƀ`ƒFƒbƒN‚µ‚Ä‚¢‚Ü‚·B"
# c:\oss\winpt\src\wptKeyEditDlgs.cpp:155
@@ -5269,75 +5308,75 @@
msgid "Trustlist"
msgstr "M—pˆê——‚Ђ傤"
-#: Src/wptMainProc.cpp:97
+#: Src/wptMainProc.cpp:104
msgid "Delete Clipboard Contents"
msgstr "ƒNƒŠƒbƒvƒ{[ƒh“à—e‚ð휂·‚éB"
-#: Src/wptMainProc.cpp:99
+#: Src/wptMainProc.cpp:106
msgid "&Remember the answer"
msgstr "“š‚ðŠo‚¦‚Ä‚‚¾‚³‚¢(&R)"
# c:\oss\winpt\src\wptKeyManager.cpp:1092
-#: Src/wptMainProc.cpp:101
+#: Src/wptMainProc.cpp:108
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:197
+#: Src/wptMainProc.cpp:204
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:245 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "ƒeƒLƒXƒg“ü—Í"
# c:\oss\winpt\src\wptMainProc.cpp:284
-#: Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:273
msgid "Unknown OpenPGP type."
msgstr "–¢’m‚ÌOpenPGPƒ^ƒCƒv"
# c:\oss\winpt\src\wptMainProc.cpp:336
-#: Src/wptMainProc.cpp:344
+#: Src/wptMainProc.cpp:370
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:406
+#: Src/wptMainProc.cpp:422
msgid "About..."
msgstr "WinPT‚ɂ‚¢‚Ä..."
# c:\oss\winpt\src\wptMainProc.cpp:405 c:\oss\winpt\src\wptMainProc.cpp:409
-#: Src/wptMainProc.cpp:412 Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
msgid "Decrypt/Verify"
msgstr "•œ†/Šm”F"
-#: Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:443
msgid "Current Window"
msgstr "Œ»Ý‚̃EƒBƒ“ƒhƒE"
# c:\oss\winpt\src\wptMainProc.cpp:465
-#: Src/wptMainProc.cpp:485
+#: Src/wptMainProc.cpp:501
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:486 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr "WinPT"
# c:\oss\winpt\src\wptMainProc.cpp:476
-#: Src/wptMainProc.cpp:496
+#: Src/wptMainProc.cpp:512
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:529
+#: Src/wptMainProc.cpp:545
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -5348,7 +5387,7 @@
# c:\oss\winpt\src\wptMainProc.cpp:566
# c:\oss\winpt\src\wptPreferencesDlg.cpp:121
-#: Src/wptMainProc.cpp:583 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "WinPTƒJƒXƒ^ƒ€Ý’è"
@@ -5359,7 +5398,13 @@
msgstr "MAPI‚̃ƒOƒCƒ“‚ÉŽ¸”s‚µ‚Ü‚µ‚½B"
# c:\oss\winpt\src\wptMAPI.cpp:103 c:\oss\winpt\src\wptMAPI.cpp:325
-#: Src/wptMAPI.cpp:140 Src/wptMAPI.cpp:263
+#: Src/wptMAPI.cpp:140
+#, fuzzy
+msgid "Could not send mail."
+msgstr "ƒ[ƒ‹‚ð‘—M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
+# c:\oss\winpt\src\wptMAPI.cpp:103 c:\oss\winpt\src\wptMAPI.cpp:325
+#: Src/wptMAPI.cpp:263
msgid "Could not sent mail."
msgstr "ƒ[ƒ‹‚ð‘—M‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
@@ -5504,11 +5549,12 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:227
#: Src/wptPassphraseDlg.cpp:144
+#, fuzzy
msgid ""
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
"\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"ƒpƒXƒtƒŒ[ƒY‚Ì’·‚³‚ÍÅ’á8•¶Žš‚ÅA\n"
"ƒAƒ‹ƒtƒ@ƒxƒbƒgˆÈŠO‚Ì•¶Žš‚ðŠÜ‚ß‚é•K—v‚ª‚ ‚è‚Ü‚·B\n"
@@ -5519,10 +5565,11 @@
# c:\oss\winpt\src\wptKeygenDlg.cpp:250
# c:\oss\winpt\src\wptPassphraseDlg.cpp:153
#: Src/wptPassphraseDlg.cpp:154
+#, fuzzy
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"ƒpƒXƒtƒŒ[ƒY‚É‚Í8-bit•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B\n"
"'charset' ê—p•¶Žš‚ÌŽg—p‚Í„‘E‚µ‚Ä‚¨‚è‚Ü‚¹‚ñB‚Ü‚¾‘±‚¯‚Ü‚·‚©H"
@@ -5659,9 +5706,10 @@
# c:\oss\winpt\src\wptPreferencesDlg.cpp:182
#: Src/wptPreferencesDlg.cpp:222
+#, fuzzy
msgid ""
"In most cases it is not a good idea to enable this setting.\n"
-"If you know what you are doing let this flag enabled, otherwise\n"
+"If you know what you are doing, you can enable this flag, otherwise\n"
"it is safe to leave this flag untouched."
msgstr ""
"‚Ù‚Æ‚ñ‚Ç‚ÌꇂÍA‚±‚ÌÝ’è‚ð—LŒø‚·‚é‚Ì‚Í‚æ‚‚ ‚è‚Ü‚¹‚ñB\n"
@@ -5868,6 +5916,18 @@
msgid "Signed"
msgstr "–¼‚µ‚Ü‚µ‚½"
+# c:\oss\winpt\src\wptCardDlg.cpp:639
+#~ msgid "Admin PIN must be minimal 8 characters."
+#~ msgstr "ŠÇ—ŽÒ—pˆÃؔԆ‚Ì’·‚³‚ÍÅ’á‚W•¶Žš‚Å‚·B"
+
+# c:\oss\winpt\src\wptCardDlg.cpp:644
+#~ msgid "PIN must be minimal 6 characters."
+#~ msgstr "ˆÃؔԆ‚Ì’·‚³‚ÍÅ’á‚U•¶Žš‚Å‚·B"
+
+# c:\oss\winpt\src\wptKeyEditDlgs.cpp:789
+#~ msgid "Change Passwd"
+#~ msgstr "ƒpƒXƒ[ƒh‚Ì•ÏX"
+
# c:\oss\winpt\src\wptMainProc.cpp:398
#~ msgid "Edit Clipboard"
#~ msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚Ì•ÒW"
Modified: trunk/Po/pt_BR.po
===================================================================
--- trunk/Po/pt_BR.po 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Po/pt_BR.po 2006-07-28 11:11:09 UTC (rev 248)
@@ -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-13 09:48+0200\n"
+"POT-Creation-Date: 2006-07-28 12:57+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"
@@ -18,13 +18,13 @@
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:487
-#: Src/WinPT.cpp:494 Src/WinPT.cpp:534 Src/WinPT.cpp:562 Src/WinPT.cpp:571
-#: Src/WinPT.cpp:575 Src/WinPT.cpp:592 Src/WinPT.cpp:660 Src/WinPT.cpp:673
-#: Src/WinPT.cpp:720 Src/WinPT.cpp:750 Src/WinPT.cpp:768
-#: Src/wptCommonDlg.cpp:220 Src/wptErrors.cpp:141 Src/wptGPG.cpp:921
-#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:943 Src/wptGPG.cpp:954
-#: Src/wptMainProc.cpp:345 Src/wptMainProc.cpp:528
+#: 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
msgid "WinPT Error"
msgstr "Erro WinPT"
@@ -54,7 +54,7 @@
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:994 Src/wptKeyserver.cpp:634
+#: Src/wptKeyManagerDlg.cpp:998 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
@@ -70,15 +70,22 @@
msgid "Failed to copy the keyserver.conf"
msgstr "Não foi possível copiar keyserver.conf"
-#: Src/WinPT.cpp:486
+#: Src/WinPT.cpp:477
+#, 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
msgid "Cryptographic selftest failed."
msgstr "Auto-teste criptográfico falhou."
-#: Src/WinPT.cpp:493
+#: Src/WinPT.cpp:491
msgid "A newer GPGME version is needed; at least "
msgstr "Uma versão mais nova do GPGME é necessária: pelo menos "
-#: Src/WinPT.cpp:535
+#: Src/WinPT.cpp:533
#, c-format
msgid ""
"GPG home directory is not set correctly.\n"
@@ -89,16 +96,16 @@
"Por favor verifique as configurações de registro do GPG:\n"
"%s."
-#: Src/WinPT.cpp:539
+#: Src/WinPT.cpp:537
msgid "Select GPG Public Keyring"
msgstr "Selecionar chaveiro público do GPG"
-#: Src/WinPT.cpp:561
+#: Src/WinPT.cpp:559
#, 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:569
+#: Src/WinPT.cpp:567
msgid ""
"Could not find the GPG binary (gpg.exe).\n"
"Do you want to start the GPG preferences to correct this problem?"
@@ -106,32 +113,33 @@
"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:584
+#: Src/WinPT.cpp:582
+#, fuzzy
msgid ""
"Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n"
"\n"
-"Continue if you want that WinPT offers you more choices.\n"
+"Continue if you want WinPT to offer you more choices.\n"
msgstr ""
"Não foi possível acessar e/ou encontrar o chaveiro público e privado.\n"
"Se isso for um acidente, saia do programa e corrija-o.\n"
"\n"
"Continue se você quiser que o WinPT ofereça mais opções.\n"
-#: Src/WinPT.cpp:617 Src/wptFileManagerDlg.cpp:525
+#: Src/WinPT.cpp:615 Src/wptFileManagerDlg.cpp:525
#: Src/wptFileManagerDlg.cpp:835
msgid "Wipe Free Space"
msgstr "Triturar espaço livre"
-#: Src/WinPT.cpp:659
+#: Src/WinPT.cpp:657
msgid "Could not register window class"
msgstr "Não foi possível registrar a classe de janela"
-#: Src/WinPT.cpp:673
+#: Src/WinPT.cpp:671
msgid "Could not create window"
msgstr "Não foi possível criar a janela"
-#: Src/WinPT.cpp:748
+#: Src/WinPT.cpp:746
msgid ""
"The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"
@@ -139,15 +147,16 @@
"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:751
+#: Src/WinPT.cpp:749
+#, fuzzy
msgid ""
-"It seems that GPG is not set properly.\n"
+"It seems that GPG is not configured properly.\n"
"Do you want to start the GPG preferences dialog?"
msgstr ""
"Parece que o GPG não está configurado corretamente.\n"
"Você deseja iniciar a janela de preferências do GPG?"
-#: Src/WinPT.cpp:769
+#: Src/WinPT.cpp:767
#, c-format
msgid ""
"Default key (from the GPG config file) could not be found.\n"
@@ -169,8 +178,8 @@
msgid "About GnuPG"
msgstr "Sobre o GnuPG"
-#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1892
-#: Src/wptMainProc.cpp:577
+#: Src/wptAboutDlgs.cpp:89 Src/wptKeyManagerDlg.cpp:1905
+#: Src/wptMainProc.cpp:593
msgid "About WinPT"
msgstr "Sobre o WinPT"
@@ -225,11 +234,11 @@
msgstr "&Sobre o GPG..."
#: Src/wptAboutDlgs.cpp:110 Src/wptKeyEditDlgs.cpp:2152
-#: Src/wptKeyManagerDlg.cpp:1000
+#: Src/wptKeyManagerDlg.cpp:1004
msgid "&Help"
msgstr "A&juda"
-#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:402
+#: Src/wptCardDlg.cpp:141 Src/wptMainProc.cpp:420
msgid "Card Manager"
msgstr "Gerenciador de cartões"
@@ -253,7 +262,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:284
+#: Src/wptMainProc.cpp:291
msgid "Card Edit"
msgstr "Editar cartão"
@@ -302,9 +311,10 @@
"Nº Serial: %s\n"
#: Src/wptCardDlg.cpp:505
+#, fuzzy
msgid ""
"This operation will override the keys on the card.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Esta operação irá sobrescrever as chaves no cartão.\n"
"Prosseguir?"
@@ -341,7 +351,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:1788
+#: Src/wptCardDlg.cpp:588 Src/wptKeyManagerDlg.cpp:1801
msgid "Card Key Generation"
msgstr "Geração da chave do cartão"
@@ -369,8 +379,9 @@
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:448
-msgid "The date you have chosen lies in the past."
+#: Src/wptCardDlg.cpp:663 Src/wptKeyEditDlgs.cpp:1363 Src/wptKeygenDlg.cpp:459
+#, fuzzy
+msgid "The date you have chosen has already passed."
msgstr "A data escolhida está no passado."
#: Src/wptCardDlg.cpp:689
@@ -394,12 +405,14 @@
msgstr "Por favor coloque o PIN novo do cartão."
#: Src/wptCardDlg.cpp:731
-msgid "Admin PIN must be minimal 8 characters."
-msgstr "PIN do administrador deve ter no mínimo 8 caracteres."
+#, fuzzy
+msgid "Admin PIN must be at least 8 characters."
+msgstr "'PIN do administrador' deve ter pelo menos 8 caracteres."
#: Src/wptCardDlg.cpp:736
-msgid "PIN must be minimal 6 characters."
-msgstr "PIN deve ter no mínimo 6 caracteres."
+#, fuzzy
+msgid "PIN must be at least 6 characters."
+msgstr "'PIN do usuário' deve ter pelo menos 6 caracteres."
#: Src/wptCardDlg.cpp:759
msgid "Change Card PIN"
@@ -497,8 +510,8 @@
#: Src/wptClipVerifyDlg.cpp:237 Src/wptFileManager.cpp:1636
#: Src/wptFileManager.cpp:1689 Src/wptFileManagerDlg.cpp:591
#: Src/wptFileVerifyDlg.cpp:83 Src/wptFileVerifyDlg.cpp:150
-#: Src/wptMainProc.cpp:179 Src/wptMainProc.cpp:239 Src/wptMainProc.cpp:253
-#: Src/wptMainProc.cpp:261 Src/wptMainProc.cpp:413
+#: Src/wptMainProc.cpp:186 Src/wptMainProc.cpp:246 Src/wptMainProc.cpp:260
+#: Src/wptMainProc.cpp:268 Src/wptMainProc.cpp:429
msgid "Verify"
msgstr "Verificar"
@@ -530,11 +543,12 @@
"guarda)."
#: Src/wptClipDecryptDlg.cpp:257
+#, fuzzy
msgid ""
"WARNING: encrypted message has been manipulated!\n"
"\n"
"Do *NOT* trust any text or data output from this file!\n"
-"It is likely, the data was corrupted during the transport\n"
+"It is likely that the data was corrupted in transport\n"
"but it might be also possible that this is part of an attack."
msgstr ""
"AVISO: a mensagem cifrada foi manipulada!\n"
@@ -550,7 +564,7 @@
#: Src/wptClipDecryptDlg.cpp:266 Src/wptClipEncryptDlg.cpp:215
#: Src/wptClipSignDlg.cpp:121 Src/wptClipSignDlg.cpp:267
#: Src/wptClipSignEncDlg.cpp:190 Src/wptKeyManager.cpp:304
-#: Src/wptKeyManager.cpp:781 Src/wptKeyManager.cpp:971 Src/wptSymEnc.cpp:94
+#: Src/wptKeyManager.cpp:801 Src/wptKeyManager.cpp:991 Src/wptSymEnc.cpp:94
msgid "GnuPG Status: Finished"
msgstr "Estado do GnuPG: Concluído"
@@ -558,8 +572,8 @@
#: 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:164 Src/wptMainProc.cpp:227 Src/wptMainProc.cpp:266
-#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:509 Src/wptMainProc.cpp:514
+#: Src/wptMainProc.cpp:171 Src/wptMainProc.cpp:234 Src/wptMainProc.cpp:273
+#: Src/wptMainProc.cpp:442 Src/wptMainProc.cpp:525 Src/wptMainProc.cpp:530
msgid "Clipboard"
msgstr "Área de transferência"
@@ -568,9 +582,10 @@
msgstr "Abrir arquivo"
#: Src/wptClipEditDlg.cpp:122
+#, fuzzy
msgid ""
"The file you want to add is very large.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"O arquivo que você deseja adicionar é muito grande.\n"
"Prosseguir?"
@@ -617,7 +632,7 @@
msgid "&Decrypt"
msgstr "&Decifrar"
-#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:571
+#: Src/wptClipEditDlg.cpp:221 Src/wptMainProc.cpp:587
msgid "Clipboard Editor"
msgstr "Editor da área de transferência"
@@ -632,8 +647,8 @@
#: Src/wptClipEncryptDlg.cpp:134 Src/wptClipEncryptDlg.cpp:155
#: Src/wptClipEncryptDlg.cpp:205 Src/wptClipEncryptDlg.cpp:212
-#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:146
-#: Src/wptMainProc.cpp:209
+#: Src/wptClipEncryptDlg.cpp:241 Src/wptMainProc.cpp:153
+#: Src/wptMainProc.cpp:216
msgid "Encryption"
msgstr "Cifragem"
@@ -649,7 +664,7 @@
#: 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:538 Src/wptKeyRevokeDlg.cpp:79
+#: 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/wptPassphraseDlg.cpp:104 Src/wptPINDlg.cpp:54
@@ -682,7 +697,7 @@
#: Src/wptClipSignDlg.cpp:262 Src/wptClipSignEncDlg.cpp:159
#: Src/wptClipSignEncDlg.cpp:170 Src/wptFileManager.cpp:1153
#: Src/wptFileManager.cpp:1169 Src/wptFileManager.cpp:1459
-#: Src/wptMainProc.cpp:158 Src/wptMainProc.cpp:215
+#: Src/wptMainProc.cpp:165 Src/wptMainProc.cpp:222
msgid "Signing"
msgstr "Assinar"
@@ -701,7 +716,7 @@
#: Src/wptClipSignEncDlg.cpp:111 Src/wptClipSignEncDlg.cpp:151
#: Src/wptClipSignEncDlg.cpp:179 Src/wptClipSignEncDlg.cpp:188
-#: Src/wptMainProc.cpp:152 Src/wptMainProc.cpp:221
+#: Src/wptMainProc.cpp:159 Src/wptMainProc.cpp:228
msgid "Sign & Encrypt"
msgstr "Assinar e cifrar"
@@ -794,8 +809,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:1028
-#: Src/wptKeyManagerDlg.cpp:1916
+#: Src/wptKeyEditDlgs.cpp:2202 Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1929
msgid "Key Edit"
msgstr "Editar chave"
@@ -830,10 +845,10 @@
msgstr "Não foi possível achar GPG.exe em %s."
#: Src/wptErrors.cpp:52
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Could not find keyring entries into the options file in %s or the file does "
-"NOT exist."
+"Could not find keyring entries in the config file in %s or the file does NOT "
+"exist."
msgstr ""
"Não foi possível achar as entradas de chaveiro no arquivo de opções em %s ou "
"o arquivo NÃO existe."
@@ -1011,7 +1026,7 @@
#: 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:400 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
+#: Src/wptMainProc.cpp:418 Src/wptMDSumDlg.cpp:276 Src/wptMDSumDlg.cpp:281
msgid "File Manager"
msgstr "Gerenciador de arquivos"
@@ -1038,9 +1053,10 @@
msgstr "Não foi possível reiniciar atributos do arquivo para normal."
#: Src/wptFileManager.cpp:195
+#, fuzzy
msgid ""
"Multi-Media files are already compressed, GPG would compress\n"
-"them anyway and this costs a lot of time.\n"
+"them anyway and this takes a lot of time.\n"
"It is possible to disable compression for these files.\n"
"Do you want to disable it?"
msgstr ""
@@ -1097,13 +1113,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:197
-#: Src/wptMainProc.cpp:410 Src/wptMainProc.cpp:417
+#: Src/wptFileManagerDlg.cpp:589 Src/wptMainProc.cpp:204
+#: Src/wptMainProc.cpp:426 Src/wptMainProc.cpp:433
msgid "Sign"
msgstr "Assinar"
#: Src/wptFileManager.cpp:1196 Src/wptFileManagerDlg.cpp:587
-#: Src/wptMainProc.cpp:409 Src/wptMainProc.cpp:414
+#: Src/wptMainProc.cpp:425 Src/wptMainProc.cpp:430
msgid "Encrypt"
msgstr "Cifrar"
@@ -1112,7 +1128,7 @@
msgstr "Cifragem simétrica"
#: Src/wptFileManager.cpp:1256 Src/wptFileManager.cpp:1261
-#: Src/wptMainProc.cpp:408 Src/wptMainProc.cpp:418
+#: Src/wptMainProc.cpp:424 Src/wptMainProc.cpp:434
msgid "Symmetric"
msgstr "Simétrica"
@@ -1210,8 +1226,8 @@
msgid "Export"
msgstr "Exportar"
-#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1852
-#: Src/wptKeyManagerDlg.cpp:1884
+#: Src/wptFileManager.cpp:1777 Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1897
msgid "Choose Name for Key File"
msgstr "Escolher nome para arquivo de chaves"
@@ -1276,7 +1292,7 @@
msgstr "&Selecione chave para assinar"
#: Src/wptFileManagerDlg.cpp:96 Src/wptFileManagerDlg.cpp:292
-#: Src/wptKeyManagerDlg.cpp:992
+#: Src/wptKeyManagerDlg.cpp:996
msgid "Options"
msgstr "Opções"
@@ -1300,7 +1316,7 @@
msgstr "%s contém(êm) %d chave(s)."
#: Src/wptFileManagerDlg.cpp:225 Src/wptFileManagerDlg.cpp:504
-#: Src/wptKeyManagerDlg.cpp:965 Src/wptOwnertrustDlg.cpp:98
+#: Src/wptKeyManagerDlg.cpp:969 Src/wptOwnertrustDlg.cpp:98
msgid "File"
msgstr "Arquivo"
@@ -1338,11 +1354,11 @@
#: Src/wptFileManagerDlg.cpp:338 Src/wptKeyEditDlgs.cpp:1288
#: Src/wptKeyEditDlgs.cpp:1339 Src/wptKeyEditDlgs.cpp:1412
-#: Src/wptKeyManager.cpp:701 Src/wptKeyManager.cpp:802
-#: Src/wptKeyManager.cpp:836 Src/wptKeyManagerDlg.cpp:1665
-#: Src/wptKeyManagerDlg.cpp:1681 Src/wptKeyManagerDlg.cpp:1709
-#: Src/wptKeyManagerDlg.cpp:1720 Src/wptKeyManagerDlg.cpp:1735
-#: Src/wptKeyManagerDlg.cpp:1842 Src/wptKeyManagerDlg.cpp:1861
+#: Src/wptKeyManager.cpp:721 Src/wptKeyManager.cpp:822
+#: Src/wptKeyManager.cpp:856 Src/wptKeyManagerDlg.cpp:1678
+#: Src/wptKeyManagerDlg.cpp:1694 Src/wptKeyManagerDlg.cpp:1722
+#: Src/wptKeyManagerDlg.cpp:1733 Src/wptKeyManagerDlg.cpp:1748
+#: Src/wptKeyManagerDlg.cpp:1855 Src/wptKeyManagerDlg.cpp:1874
#: Src/wptKeyserverSearchDlg.cpp:143
msgid "Please select a key."
msgstr "Por favor selecione uma chave."
@@ -1356,17 +1372,17 @@
msgid "%d Object(s) marked"
msgstr "%d Objeto(s) marcado(s)"
-#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:541
+#: Src/wptFileManagerDlg.cpp:501 Src/wptMainProc.cpp:557
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:966
-#: Src/wptKeyManagerDlg.cpp:971 Src/wptKeyManagerDlg.cpp:982
-#: Src/wptMainProc.cpp:405
+#: Src/wptFileManagerDlg.cpp:505 Src/wptKeyManagerDlg.cpp:970
+#: Src/wptKeyManagerDlg.cpp:975 Src/wptKeyManagerDlg.cpp:986
+#: Src/wptMainProc.cpp:421
msgid "Edit"
msgstr "Editar"
-#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:967
+#: Src/wptFileManagerDlg.cpp:506 Src/wptKeyManagerDlg.cpp:971
msgid "View"
msgstr "Exibir"
@@ -1374,13 +1390,13 @@
msgid "Encrypt into ZIP"
msgstr "Cifrar para &ZIP"
-#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:983
-#: Src/wptKeyManagerDlg.cpp:1031
+#: Src/wptFileManagerDlg.cpp:511 Src/wptKeyManagerDlg.cpp:987
+#: Src/wptKeyManagerDlg.cpp:1036
msgid "&Sign"
msgstr "As&sinar"
#: Src/wptFileManagerDlg.cpp:512 Src/wptFileManagerDlg.cpp:590
-#: Src/wptMainProc.cpp:411 Src/wptMainProc.cpp:415
+#: Src/wptMainProc.cpp:427 Src/wptMainProc.cpp:431
msgid "Sign && Encrypt"
msgstr "Assinar e cifrar"
@@ -1400,7 +1416,7 @@
msgid "E&xport"
msgstr "E&xportar"
-#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:407
+#: Src/wptFileManagerDlg.cpp:517 Src/wptMainProc.cpp:423
msgid "Exit"
msgstr "Sair"
@@ -1452,11 +1468,11 @@
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:102
+#: Src/wptFileManagerDlg.cpp:788 Src/wptMainProc.cpp:109
msgid "&Yes"
msgstr "&Sim"
-#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:103
+#: Src/wptFileManagerDlg.cpp:789 Src/wptMainProc.cpp:110
msgid "&No"
msgstr "&Não"
@@ -1525,7 +1541,7 @@
msgid "WinPT First Start"
msgstr "Primeira execução do WinPT"
-#: Src/wptGPG.cpp:839
+#: Src/wptGPG.cpp:830
msgid ""
"The selected keyring has the read-only file\n"
"attribute. In this state you do not have write\n"
@@ -1535,19 +1551,19 @@
"somente-leitura. Nesse estado você não tem acesso de\n"
"escrita. Você deseja remover o atributo?"
-#: Src/wptGPG.cpp:842
+#: Src/wptGPG.cpp:833
msgid "GPG Information"
msgstr "Informação do GPG"
-#: Src/wptGPG.cpp:846
+#: Src/wptGPG.cpp:837
msgid "Could not reset read-only state."
msgstr "Não foi possível remover o estado somente-leitura."
-#: Src/wptGPG.cpp:847 Src/wptGPG.cpp:1130 Src/wptGPG.cpp:1139
+#: Src/wptGPG.cpp:838 Src/wptGPG.cpp:1119 Src/wptGPG.cpp:1128
msgid "GPG Error"
msgstr "Erro do GPG"
-#: Src/wptGPG.cpp:859
+#: Src/wptGPG.cpp:850
msgid ""
"You do not have file access to modify the contents of\n"
"one or both of the selected keyrings.\n"
@@ -1561,23 +1577,23 @@
"Os chaveiros estão num estado somente-leitura que é provavelmente\n"
"causado por outro programa que já abriu os arquivos.\n"
-#: Src/wptGPG.cpp:864
+#: Src/wptGPG.cpp:855
msgid "GPG Warning"
msgstr "Aviso do GPG"
-#: Src/wptGPG.cpp:888 Src/wptGPGPrefsDlg.cpp:220 Src/wptGPGPrefsDlg.cpp:226
+#: 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:993
-#: Src/wptMainProc.cpp:428 Src/wptPreferencesDlg.cpp:225
+#: 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
msgid "Preferences"
msgstr "Preferências"
-#: Src/wptGPG.cpp:889
+#: Src/wptGPG.cpp:880
#, c-format
msgid ""
"%s does not exit.\n"
@@ -1586,54 +1602,54 @@
"%s não existe.\n"
"Você deseja criar esse diretório?"
-#: Src/wptGPG.cpp:917
+#: Src/wptGPG.cpp:908
msgid "Please choose your Public Keyring"
msgstr "Por favor escolha seu chaveiro público"
-#: Src/wptGPG.cpp:920 Src/wptGPG.cpp:942
+#: Src/wptGPG.cpp:911 Src/wptGPG.cpp:933
msgid "No keyring was chosen. Exit."
msgstr "Nenhum chaveiro foi escolhido. Saindo."
-#: Src/wptGPG.cpp:927
+#: Src/wptGPG.cpp:918
msgid "Overwrite old public keyring?"
msgstr "Sobrescrever antigo chaveiro público?"
-#: Src/wptGPG.cpp:933 Src/wptGPG.cpp:954
+#: Src/wptGPG.cpp:924 Src/wptGPG.cpp:945
msgid "Could not copy file."
msgstr "Não foi possível copiar o arquivo."
-#: Src/wptGPG.cpp:939
+#: Src/wptGPG.cpp:930
msgid "Please choose your Secret Keyring"
msgstr "Por favor escolha seu chaveiro privado"
-#: Src/wptGPG.cpp:948
+#: Src/wptGPG.cpp:939
msgid "Overwrite old secret keyring?"
msgstr "Sobrescrever antigo chaveiro privado?"
-#: Src/wptGPG.cpp:998 Src/wptGPG.cpp:1089 Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:989 Src/wptGPG.cpp:1078 Src/wptGPG.cpp:1091
msgid "Backup"
msgstr "Backup"
-#: Src/wptGPG.cpp:998
+#: Src/wptGPG.cpp:989
#, c-format
msgid "Backup keyring \"%s\" failed"
msgstr "Backup do chaveiro \"%s\" falhou"
-#: Src/wptGPG.cpp:1090
-#, c-format
+#: Src/wptGPG.cpp:1079
+#, fuzzy, c-format
msgid ""
-"The backup drive '%s' does not seems to accessable.\n"
+"The backup drive '%s' does not seems to be accessable.\n"
"Please insert/check the drive to continue."
msgstr ""
"O drive de backup '%s' não parece estar acessível.\n"
"Por favor insira/verifique o drive para continuar."
-#: Src/wptGPG.cpp:1102
+#: Src/wptGPG.cpp:1091
#, c-format
msgid "Invalid backup mode %d"
msgstr "Modo de backup %d inválido"
-#: Src/wptGPG.cpp:1129
+#: Src/wptGPG.cpp:1118
msgid "No GPG error description available."
msgstr "Descrição indisponível para o erro do GPG."
@@ -1673,13 +1689,13 @@
msgid "Good Signature (Revoked Key)"
msgstr "Assinatura boa (chave revogada)"
-#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:97
+#: Src/wptGPGOptDlg.cpp:48 Src/wptGPGOptDlg.cpp:98
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:69 Src/wptGPGOptDlg.cpp:75
-#: Src/wptGPGOptDlg.cpp:80 Src/wptGPGOptDlg.cpp:84 Src/wptGPGOptDlg.cpp:91
-#: Src/wptGPGOptDlg.cpp:97
+#: 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
msgid "GPG Config"
msgstr "Configuração do GPG"
@@ -1691,23 +1707,28 @@
msgid "&Load"
msgstr "Ca&rregar"
-#: Src/wptGPGOptDlg.cpp:69
+#: Src/wptGPGOptDlg.cpp:57
+#, fuzzy
+msgid "&Exit"
+msgstr "Sair"
+
+#: Src/wptGPGOptDlg.cpp:70
msgid "The 'gpg.conf' file is not loaded."
msgstr "O arquivo 'gpg.conf' não foi carregado."
-#: Src/wptGPGOptDlg.cpp:75
+#: Src/wptGPGOptDlg.cpp:76
msgid "File contains invalid GnuPG keywords!"
msgstr "Arquivo contém palavras-chave GnuPG inválidas!"
-#: Src/wptGPGOptDlg.cpp:80
+#: Src/wptGPGOptDlg.cpp:81
msgid "Could not save GnuPG config file."
msgstr "Não foi possível salvar o arquivo de configuração do GnuPG."
-#: Src/wptGPGOptDlg.cpp:84
+#: Src/wptGPGOptDlg.cpp:85
msgid "Successfully saved."
msgstr "Salvo com sucesso."
-#: Src/wptGPGOptDlg.cpp:90
+#: Src/wptGPGOptDlg.cpp:91
msgid ""
"Current data will be lost!\n"
"Are you sure?"
@@ -1715,8 +1736,8 @@
"Dados atuais serão perdidos!\n"
"Tem certeza?"
-#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1814
-#: Src/wptMainProc.cpp:589
+#: Src/wptGPGPrefsDlg.cpp:150 Src/wptKeyManagerDlg.cpp:1827
+#: Src/wptMainProc.cpp:605
msgid "GnuPG Preferences"
msgstr "Preferências do GnuPG"
@@ -1806,27 +1827,27 @@
#: Src/wptKeyManager.cpp:440 Src/wptKeyManager.cpp:443
#: Src/wptKeyManager.cpp:448 Src/wptKeyManager.cpp:454
#: Src/wptKeyManager.cpp:459 Src/wptKeyManager.cpp:587
-#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:701
-#: Src/wptKeyManager.cpp:729 Src/wptKeyManager.cpp:738
-#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:775
-#: Src/wptKeyManager.cpp:802 Src/wptKeyManager.cpp:807
-#: Src/wptKeyManager.cpp:831 Src/wptKeyManager.cpp:836
-#: Src/wptKeyManager.cpp:850 Src/wptKeyManager.cpp:907
-#: Src/wptKeyManager.cpp:912 Src/wptKeyManager.cpp:969
-#: Src/wptKeyManager.cpp:1002 Src/wptKeyManager.cpp:1086
-#: Src/wptKeyManagerDlg.cpp:1314 Src/wptKeyManagerDlg.cpp:1325
-#: Src/wptKeyManagerDlg.cpp:1335 Src/wptKeyManagerDlg.cpp:1643
-#: Src/wptKeyManagerDlg.cpp:1666 Src/wptKeyManagerDlg.cpp:1681
-#: Src/wptKeyManagerDlg.cpp:1691 Src/wptKeyManagerDlg.cpp:1699
-#: Src/wptKeyManagerDlg.cpp:1709 Src/wptKeyManagerDlg.cpp:1720
-#: Src/wptKeyManagerDlg.cpp:1735 Src/wptKeyManagerDlg.cpp:1752
-#: Src/wptKeyManagerDlg.cpp:1784 Src/wptKeyManagerDlg.cpp:1843
-#: Src/wptKeyManagerDlg.cpp:1861 Src/wptKeyManagerDlg.cpp:1866
-#: Src/wptKeyManagerDlg.cpp:1871 Src/wptKeyManagerDlg.cpp:1942
-#: Src/wptKeyManagerDlg.cpp:1947 Src/wptKeyManagerDlg.cpp:2060
+#: Src/wptKeyManager.cpp:595 Src/wptKeyManager.cpp:721
+#: Src/wptKeyManager.cpp:749 Src/wptKeyManager.cpp:758
+#: Src/wptKeyManager.cpp:769 Src/wptKeyManager.cpp:795
+#: Src/wptKeyManager.cpp:822 Src/wptKeyManager.cpp:827
+#: Src/wptKeyManager.cpp:851 Src/wptKeyManager.cpp:856
+#: Src/wptKeyManager.cpp:870 Src/wptKeyManager.cpp:927
+#: Src/wptKeyManager.cpp:932 Src/wptKeyManager.cpp:989
+#: Src/wptKeyManager.cpp:1022 Src/wptKeyManager.cpp:1106
+#: 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/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:401 Src/wptMainProc.cpp:552 Src/wptMainProc.cpp:560
+#: Src/wptMainProc.cpp:419 Src/wptMainProc.cpp:568 Src/wptMainProc.cpp:576
msgid "Key Manager"
msgstr "Gerenciador de chaves"
@@ -1932,20 +1953,20 @@
msgstr "ID de usuário inválida"
#: Src/wptImportList.cpp:345 Src/wptKeylist.cpp:579 Src/wptKeylist.cpp:587
-#: Src/wptKeyManagerDlg.cpp:910 Src/wptKeyManagerDlg.cpp:979
+#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyManagerDlg.cpp:983
#: Src/wptKeyserverSearchDlg.cpp:58 Src/wptSigList.cpp:53
#: Src/wptVerifyList.cpp:166
msgid "User ID"
msgstr "ID de usuário"
#: Src/wptImportList.cpp:346 Src/wptKeylist.cpp:581 Src/wptKeylist.cpp:590
-#: Src/wptKeyManagerDlg.cpp:913 Src/wptKeyserverSearchDlg.cpp:54
+#: Src/wptKeyManagerDlg.cpp:916 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:911
-#: Src/wptKeyManagerDlg.cpp:1002 Src/wptKeyRevokersDlg.cpp:58
+#: Src/wptKeylist.cpp:580 Src/wptKeylist.cpp:588 Src/wptKeyManagerDlg.cpp:914
+#: Src/wptKeyManagerDlg.cpp:1006 Src/wptKeyRevokersDlg.cpp:58
#: Src/wptKeyserverSearchDlg.cpp:56 Src/wptSigList.cpp:57
#: Src/wptVerifyList.cpp:165
msgid "Key ID"
@@ -1953,20 +1974,21 @@
#: Src/wptImportList.cpp:348 Src/wptKeyEditDlgs.cpp:1073
#: Src/wptKeyEditDlgs.cpp:1158 Src/wptKeylist.cpp:594
-#: Src/wptKeyManagerDlg.cpp:917 Src/wptKeyManagerDlg.cpp:1005
+#: Src/wptKeyManagerDlg.cpp:920 Src/wptKeyManagerDlg.cpp:1009
#: Src/wptKeyserverSearchDlg.cpp:57 Src/wptSigList.cpp:56
msgid "Creation"
msgstr "Criação"
#: Src/wptImportList.cpp:349 Src/wptKeylist.cpp:589
-#: Src/wptKeyManagerDlg.cpp:912 Src/wptKeyManagerDlg.cpp:1004
+#: Src/wptKeyManagerDlg.cpp:915 Src/wptKeyManagerDlg.cpp:1008
msgid "Type"
msgstr "Tipo"
#: Src/wptImportList.cpp:419
+#, fuzzy
msgid ""
"It is possible that the ASCII-Armor is damaged\n"
-"and thus a CRC error occurs."
+"and thus causing a CRC error."
msgstr ""
"É possível que a proteção ASCII esteja danificada\n"
"e portanto um erro CRC ocorreu."
@@ -2014,10 +2036,11 @@
"%s"
#: Src/wptKeyEditDlgs.cpp:356
+#, fuzzy
msgid ""
"Remember that the image is stored within your public key. If you use a very "
"large picture, your key will become very large as well! Keeping the image "
-"close to 240x288 is a good size to use."
+"close to 240x288 is advised."
msgstr ""
"Lembre que a imagem é guardada dentro de sua chave pública. Se você usar uma "
"figura muito grande, sua chave ficará muito grande também! Manter a imagem "
@@ -2075,8 +2098,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:490
-#: Src/wptKeygenDlg.cpp:591 Src/wptKeyPropsDlg.cpp:379
+#: Src/wptKeyEditDlgs.cpp:1812 Src/wptKeygenDlg.cpp:501
+#: Src/wptKeygenDlg.cpp:602 Src/wptKeyPropsDlg.cpp:379
#: Src/wptOwnertrustDlg.cpp:119 Src/wptOwnertrustDlg.cpp:131
msgid "GnuPG Status"
msgstr "Estado do GnuPG"
@@ -2182,7 +2205,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:1698
+#: Src/wptKeyManagerDlg.cpp:1711
msgid "There is no secret key available!"
msgstr "Não há chave secreta disponível!"
@@ -2222,18 +2245,19 @@
#: Src/wptKeyEditDlgs.cpp:1037
msgid ""
"Are you sure that you really don't want a passphrase?\n"
-"This is propably a bad idea, still proceed?"
+"This is propably a bad idea, continue?"
msgstr ""
#: Src/wptKeyEditDlgs.cpp:1053
-msgid "Change Passwd"
-msgstr "Alterar senha"
+#, fuzzy
+msgid "Change Password"
+msgstr "Alterar &senha"
#: Src/wptKeyEditDlgs.cpp:1055
msgid "Passphrase successfully changed."
msgstr "Frase secreta alterada com sucesso."
-#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:918
+#: Src/wptKeyEditDlgs.cpp:1071 Src/wptKeyManagerDlg.cpp:921
msgid "Description"
msgstr "Descrição"
@@ -2242,7 +2266,7 @@
msgstr "Expira"
#: Src/wptKeyEditDlgs.cpp:1155 Src/wptKeylist.cpp:583 Src/wptKeylist.cpp:592
-#: Src/wptKeyManagerDlg.cpp:915
+#: Src/wptKeyManagerDlg.cpp:918
msgid "Validity"
msgstr "Validade"
@@ -2256,7 +2280,7 @@
"ADDUID add a user ID\r\n"
"ADDPHOTO add a photo ID\r\n"
"DELUID delete a user ID\r\n"
-"ADDKEY add a secondard key\r\n"
+"ADDKEY add a secondary key\r\n"
"DELKEY delete a secondary key\r\n"
"ADDREVOKER add a revocation key\r\n"
"EXPIRE change the expire date\r\n"
@@ -2490,7 +2514,7 @@
"%s\n"
"\n"
"Are you sure you want to create a revocation certificate\n"
-"which allow to revoke the key listed above?"
+"which allows you to revoke the key listed above?"
msgstr ""
"Suas chaves estão listadas como um revogador autorizado para a chave\n"
"\n"
@@ -2545,10 +2569,11 @@
msgstr "Eu confio definitivamente"
#: Src/wptKeyEditOwnertrustDlg.cpp:63
+#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys (by looking at passports, checking fingerprint from different "
-"source...)?"
+"sources...)?"
msgstr ""
"Por favor decida o quanto você confia neste usuário para verificar "
"corretamente a validade das chaves de outros usuários (olhando em "
@@ -2559,8 +2584,8 @@
msgstr "Por favor escolha uma entrada."
#: Src/wptKeyEditOwnertrustDlg.cpp:83 Src/wptKeyEditOwnertrustDlg.cpp:89
-#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:973
-#: Src/wptKeyManagerDlg.cpp:1908 Src/wptKeyPropsDlg.cpp:285
+#: Src/wptKeyEditOwnertrustDlg.cpp:98 Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:1921 Src/wptKeyPropsDlg.cpp:285
#: Src/wptOwnertrustDlg.cpp:97 Src/wptOwnertrustDlg.cpp:116
#: Src/wptOwnertrustDlg.cpp:128
msgid "Ownertrust"
@@ -2579,11 +2604,11 @@
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:405 Src/wptKeygenDlg.cpp:410
-#: Src/wptKeygenDlg.cpp:415 Src/wptKeygenDlg.cpp:420 Src/wptKeygenDlg.cpp:427
-#: Src/wptKeygenDlg.cpp:435 Src/wptKeygenDlg.cpp:449 Src/wptKeygenDlg.cpp:456
-#: Src/wptKeygenDlg.cpp:466 Src/wptKeygenDlg.cpp:487 Src/wptKeygenDlg.cpp:570
-#: Src/wptKeyManagerDlg.cpp:1775 Src/wptPassphraseDlg.cpp:147
+#: 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/wptPassphraseDlg.cpp:157
msgid "Key Generation"
msgstr "Geração de chave"
@@ -2648,9 +2673,10 @@
msgstr "RSA e RSA (PGP)"
#: Src/wptKeygenDlg.cpp:373
+#, fuzzy
msgid ""
"NOTE: Key generation can be a lengthy process! Please wait until you get the "
-"message that key generation was finished."
+"message that key generation has finished."
msgstr ""
"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."
@@ -2667,55 +2693,55 @@
msgid "Key &type"
msgstr "&Tipo de chave"
-#: Src/wptKeygenDlg.cpp:404
+#: Src/wptKeygenDlg.cpp:415
msgid "Invalid value. Allowed values 1024-4096 bits."
msgstr "Valor inválido. Valores permitidos 1024-4096 bits."
-#: Src/wptKeygenDlg.cpp:409
+#: Src/wptKeygenDlg.cpp:420
msgid "Do you really need such a large key?"
msgstr "Você realmente precisa de uma chave tão grande?"
-#: Src/wptKeygenDlg.cpp:415 Src/wptKeygenDlg.cpp:547
+#: Src/wptKeygenDlg.cpp:426 Src/wptKeygenDlg.cpp:558
msgid "Please enter the name."
msgstr "Por favor insira o nome."
-#: Src/wptKeygenDlg.cpp:419 Src/wptKeygenDlg.cpp:552
+#: Src/wptKeygenDlg.cpp:430 Src/wptKeygenDlg.cpp:563
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:426 Src/wptKeygenDlg.cpp:559
+#: Src/wptKeygenDlg.cpp:437 Src/wptKeygenDlg.cpp:570
msgid "Please enter a valid email address."
msgstr "Por favor insira um e-mail válido."
-#: Src/wptKeygenDlg.cpp:434
+#: Src/wptKeygenDlg.cpp:445
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:465 Src/wptKeyRevokeDlg.cpp:180
+#: Src/wptKeygenDlg.cpp:476 Src/wptKeyRevokeDlg.cpp:180
msgid "Please enter the passphrase."
msgstr "Por favor insira a frase secreta."
-#: Src/wptKeygenDlg.cpp:490 Src/wptKeygenDlg.cpp:591
+#: Src/wptKeygenDlg.cpp:501 Src/wptKeygenDlg.cpp:602
msgid "Key Generation completed"
msgstr "Geração de chaves concluída"
-#: Src/wptKeygenDlg.cpp:531
+#: Src/wptKeygenDlg.cpp:542
msgid "&Prefer RSA keys"
msgstr "&Preferir chaves RSA"
-#: Src/wptKeygenDlg.cpp:532
+#: Src/wptKeygenDlg.cpp:543
msgid "Real name:"
msgstr "Nome real:"
-#: Src/wptKeygenDlg.cpp:533
+#: Src/wptKeygenDlg.cpp:544
msgid "Email address:"
msgstr "Endereço de e-mail:"
-#: Src/wptKeygenDlg.cpp:534
+#: Src/wptKeygenDlg.cpp:545
msgid "Name and E-Mail Assignment"
msgstr "Atribuição de nome e e-mail"
-#: Src/wptKeygenDlg.cpp:535
+#: Src/wptKeygenDlg.cpp:546
#, fuzzy
msgid ""
"Every key pair must have a name associated with it. The name and\n"
@@ -2726,7 +2752,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:536
+#: Src/wptKeygenDlg.cpp:547
#, fuzzy
msgid ""
"By associating an email address with your key pair, you will enable WinPT to "
@@ -2737,13 +2763,13 @@
"seus correspondentes a selecionar a chave pública\n"
"correta ao comunicar-se com você."
-#: Src/wptKeygenDlg.cpp:537 Src/wptKeygenDlg.cpp:548 Src/wptKeygenDlg.cpp:553
-#: Src/wptKeygenDlg.cpp:560 Src/wptKeygenDlg.cpp:566 Src/wptKeygenDlg.cpp:587
-#: Src/wptKeyManagerDlg.cpp:1798
+#: 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
msgid "Key Generation Wizard"
msgstr "Assistente de geração de chave"
-#: Src/wptKeygenDlg.cpp:565
+#: Src/wptKeygenDlg.cpp:576
msgid "Please do not add '<' or '>' to the email address."
msgstr "Por favor não adicione '<' ou '>' ao endereço de e-mail."
@@ -2827,12 +2853,12 @@
msgid "key pair"
msgstr "par de chaves"
-#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:914
-#: Src/wptKeyManagerDlg.cpp:1003
+#: Src/wptKeylist.cpp:582 Src/wptKeylist.cpp:591 Src/wptKeyManagerDlg.cpp:917
+#: Src/wptKeyManagerDlg.cpp:1007
msgid "Cipher"
msgstr "Cifragem"
-#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:916
+#: Src/wptKeylist.cpp:593 Src/wptKeyManagerDlg.cpp:919
#: Src/wptVerifyList.cpp:164
msgid "Trust"
msgstr "Confiança"
@@ -2908,8 +2934,9 @@
msgstr "Nenhuma chave OpenPGP válida encontrada."
#: Src/wptKeyManager.cpp:452
+#, fuzzy
msgid ""
-"The key you want to import is dash escacped.\n"
+"The key you want to import is dash escaped.\n"
"Do you want to extract the key?"
msgstr ""
"A chave que você deseja importar contém caracteres de escape.\n"
@@ -2954,15 +2981,15 @@
msgid "Could not read key-data from file."
msgstr "Não foi possível ler dados da chave do arquivo."
-#: Src/wptKeyManager.cpp:706
+#: Src/wptKeyManager.cpp:726
msgid "Do you really want to confirm each key?"
msgstr "Você realmente quer confirmar cada chave?"
-#: Src/wptKeyManager.cpp:707
+#: Src/wptKeyManager.cpp:727
msgid "Delete Confirmation"
msgstr "Confirmação de exclusão"
-#: Src/wptKeyManager.cpp:730
+#: Src/wptKeyManager.cpp:750
#, c-format
msgid ""
"Do you really want to delete this key?\n"
@@ -2973,7 +3000,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:739
+#: Src/wptKeyManager.cpp:759
#, c-format
msgid ""
"Do you really want to delete this KEY PAIR?\n"
@@ -2990,7 +3017,7 @@
"\n"
"%s"
-#: Src/wptKeyManager.cpp:746
+#: Src/wptKeyManager.cpp:766
msgid ""
"The actual secret key is stored on a smartcard.\n"
"Only the public key and the secret key \n"
@@ -3000,248 +3027,253 @@
"Apenas o lugar reservado para as chaves pública e\n"
"privada será excluído.\n"
-#: Src/wptKeyManager.cpp:808
+#: Src/wptKeyManager.cpp:828
#, c-format
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:830
+#: Src/wptKeyManager.cpp:850
msgid "Please only select one key."
msgstr "Por favor selecione apenas uma chave."
-#: Src/wptKeyManager.cpp:906
+#: Src/wptKeyManager.cpp:926
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:911
+#: Src/wptKeyManager.cpp:931
msgid "Could not connect to keyserver, abort procedure."
msgstr "Não foi possível conectar-se ao servidor, abortando procedimento."
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search"
msgstr "Localizar"
-#: Src/wptKeyManager.cpp:985
+#: Src/wptKeyManager.cpp:1005
msgid "Search for:"
msgstr "Procurar por:"
-#: Src/wptKeyManager.cpp:997
+#: Src/wptKeyManager.cpp:1017
#, c-format
msgid "String pattern \"%s\" not found."
msgstr "Padrão \"%s\" não encontrado."
-#: Src/wptKeyManager.cpp:1063 Src/wptKeyRevokeDlg.cpp:85
+#: Src/wptKeyManager.cpp:1083 Src/wptKeyRevokeDlg.cpp:85
msgid "0. No reason specified"
msgstr "0. Nenhuma razão especificada"
-#: Src/wptKeyManager.cpp:1064 Src/wptKeyRevokeDlg.cpp:86
+#: Src/wptKeyManager.cpp:1084 Src/wptKeyRevokeDlg.cpp:86
msgid "1. Key has been compromised"
msgstr "1. Chave foi comprometida"
-#: Src/wptKeyManager.cpp:1065 Src/wptKeyRevokeDlg.cpp:87
+#: Src/wptKeyManager.cpp:1085 Src/wptKeyRevokeDlg.cpp:87
msgid "2. Key is superseded"
msgstr "2. Chave foi substituída"
-#: Src/wptKeyManager.cpp:1066 Src/wptKeyRevokeDlg.cpp:88
+#: Src/wptKeyManager.cpp:1086 Src/wptKeyRevokeDlg.cpp:88
msgid "3. Key is no longer used"
msgstr "3. Chave não é mais usada"
-#: Src/wptKeyManagerDlg.cpp:486 Src/wptKeyManagerDlg.cpp:1023
+#: Src/wptKeyManagerDlg.cpp:487 Src/wptKeyManagerDlg.cpp:1028
msgid "Paste Key from Clipboard"
msgstr "Colar chave da área de transferência"
-#: Src/wptKeyManagerDlg.cpp:507
+#: Src/wptKeyManagerDlg.cpp:508
#, c-format
msgid "Default Key: %s"
msgstr "Chave padrão: %s"
-#: Src/wptKeyManagerDlg.cpp:509
+#: Src/wptKeyManagerDlg.cpp:510
#, c-format
msgid "Default Key: 0x%s"
msgstr "Chave padrão: 0x%s"
-#: Src/wptKeyManagerDlg.cpp:530
+#: Src/wptKeyManagerDlg.cpp:532
#, c-format
msgid "%d secret keys"
msgstr "%d chaves privadas"
-#: Src/wptKeyManagerDlg.cpp:531
+#: Src/wptKeyManagerDlg.cpp:533
#, c-format
msgid "%d keys"
msgstr "%d chaves"
-#: Src/wptKeyManagerDlg.cpp:968
+#: Src/wptKeyManagerDlg.cpp:972
msgid "Key"
msgstr "Chave"
-#: Src/wptKeyManagerDlg.cpp:969 Src/wptKeyManagerDlg.cpp:1351
+#: Src/wptKeyManagerDlg.cpp:973 Src/wptKeyManagerDlg.cpp:1363
msgid "Groups"
msgstr "Grupos"
-#: Src/wptKeyManagerDlg.cpp:972
+#: Src/wptKeyManagerDlg.cpp:976
msgid "Send Mail..."
msgstr "Enviar mensagem..."
-#: Src/wptKeyManagerDlg.cpp:974
+#: Src/wptKeyManagerDlg.cpp:978
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-#: Src/wptKeyManagerDlg.cpp:975
+#: Src/wptKeyManagerDlg.cpp:979
msgid "&Paste\tCtrl+V"
msgstr "Co&lar\tCtrl+V"
-#: Src/wptKeyManagerDlg.cpp:976
+#: Src/wptKeyManagerDlg.cpp:980
msgid "Search...\tCtrl+F"
msgstr "Localizar...\tCtrl+F"
-#: Src/wptKeyManagerDlg.cpp:977
+#: Src/wptKeyManagerDlg.cpp:981
msgid "Select All\tCtrl+A"
msgstr "Selecionar tudo\tCtrl+A"
-#: Src/wptKeyManagerDlg.cpp:978
+#: Src/wptKeyManagerDlg.cpp:982
msgid "&Quit"
msgstr "Sai&r"
-#: Src/wptKeyManagerDlg.cpp:980
+#: Src/wptKeyManagerDlg.cpp:984
msgid "&Expert"
msgstr "&Avançado"
-#: Src/wptKeyManagerDlg.cpp:981
+#: Src/wptKeyManagerDlg.cpp:985
msgid "&Normal"
msgstr "&Normal"
-#: Src/wptKeyManagerDlg.cpp:984 Src/wptKeyManagerDlg.cpp:985
-#: Src/wptKeyManagerDlg.cpp:1029
+#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:1034
msgid "&Delete"
msgstr "E&xcluir"
-#: Src/wptKeyManagerDlg.cpp:986 Src/wptKeyManagerDlg.cpp:1030
+#: Src/wptKeyManagerDlg.cpp:990 Src/wptKeyManagerDlg.cpp:1035
msgid "&Revoke Cert"
msgstr "Certificado de &Revogação"
-#: Src/wptKeyManagerDlg.cpp:987 Src/wptKeyManagerDlg.cpp:1026
+#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1031
msgid "&List Signatures"
msgstr "&Listar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:988 Src/wptKeyManagerDlg.cpp:1715
+#: Src/wptKeyManagerDlg.cpp:992 Src/wptKeyManagerDlg.cpp:1728
#: Src/wptKeyTrustPathDlg.cpp:129
msgid "List Trust Path"
msgstr "Listar caminho de confiança"
-#: Src/wptKeyManagerDlg.cpp:989
+#: Src/wptKeyManagerDlg.cpp:993
msgid "&Export..."
msgstr "&Exportar..."
-#: Src/wptKeyManagerDlg.cpp:990
+#: Src/wptKeyManagerDlg.cpp:994
msgid "&Import..."
msgstr "&Importar..."
-#: Src/wptKeyManagerDlg.cpp:991 Src/wptKeyManagerDlg.cpp:1027
+#: Src/wptKeyManagerDlg.cpp:995 Src/wptKeyManagerDlg.cpp:1032
#: Src/wptKeysigDlg.cpp:419
msgid "&Properties"
msgstr "&Propriedades"
-#: Src/wptKeyManagerDlg.cpp:995
+#: Src/wptKeyManagerDlg.cpp:999
msgid "E&xport Secret Key"
msgstr "Exportar &chave privada"
-#: Src/wptKeyManagerDlg.cpp:996
+#: Src/wptKeyManagerDlg.cpp:1000
msgid "Re&load Key Cache"
msgstr "&Recarregar cache de chaves"
-#: Src/wptKeyManagerDlg.cpp:997
+#: Src/wptKeyManagerDlg.cpp:1001
msgid "R&everify Signatures"
msgstr "Re&verificar assinaturas"
-#: Src/wptKeyManagerDlg.cpp:998
+#: Src/wptKeyManagerDlg.cpp:1002
msgid "Refresh &Keys (Keyserver)"
msgstr "Recarregar c&haves (servidor)"
-#: Src/wptKeyManagerDlg.cpp:999 Src/wptTextInputDlg.cpp:49
+#: Src/wptKeyManagerDlg.cpp:1003 Src/wptTextInputDlg.cpp:49
msgid "Info"
msgstr "Sobre o WinPT"
-#: Src/wptKeyManagerDlg.cpp:1018
+#: Src/wptKeyManagerDlg.cpp:1022
msgid "Copy User ID to Clipboard"
msgstr "Copiar ID de usuário para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1019
+#: Src/wptKeyManagerDlg.cpp:1023
msgid "Copy Key ID to Clipboard"
msgstr "Copiar ID da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1020
+#: Src/wptKeyManagerDlg.cpp:1024
msgid "Copy Fingerprint to Clipboard"
msgstr "Copiar impressão digital para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1021
+#: Src/wptKeyManagerDlg.cpp:1025
msgid "Copy Key Info to Clipboard"
msgstr "Copiar informações da chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1022
+#: Src/wptKeyManagerDlg.cpp:1026
+#, fuzzy
+msgid "Copy E-Mail to Clipboard"
+msgstr "Copiar chave para área de transferência"
+
+#: Src/wptKeyManagerDlg.cpp:1027
msgid "Copy Key to Clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1024
+#: Src/wptKeyManagerDlg.cpp:1029
msgid "Refresh from Keyserver"
msgstr "Atualizar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1025
+#: Src/wptKeyManagerDlg.cpp:1030
msgid "Set Implicit &Trust"
msgstr "Definir confiança implíci&ta"
-#: Src/wptKeyManagerDlg.cpp:1032
+#: Src/wptKeyManagerDlg.cpp:1037
msgid "&Enable"
msgstr "&Ativar"
-#: Src/wptKeyManagerDlg.cpp:1033
+#: Src/wptKeyManagerDlg.cpp:1038
msgid "&Disable"
msgstr "&Desativar"
-#: Src/wptKeyManagerDlg.cpp:1034
+#: Src/wptKeyManagerDlg.cpp:1039
msgid "Re&fresh from Keyserver"
msgstr "Atuali&zar pelo servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1035
+#: Src/wptKeyManagerDlg.cpp:1040
msgid "Set preferred Keyserver URL"
msgstr "Definir URL do servidor preferido"
-#: Src/wptKeyManagerDlg.cpp:1036
+#: Src/wptKeyManagerDlg.cpp:1041
msgid "Send Key to Mail Recipient"
msgstr "Enviar chave a destinatário de correio"
-#: Src/wptKeyManagerDlg.cpp:1037
+#: Src/wptKeyManagerDlg.cpp:1042
msgid "Set as Default Key"
msgstr "Definir como chave padrão"
-#: Src/wptKeyManagerDlg.cpp:1039
+#: Src/wptKeyManagerDlg.cpp:1044
msgid "Key..."
msgstr "Chave..."
-#: Src/wptKeyManagerDlg.cpp:1040
+#: Src/wptKeyManagerDlg.cpp:1045
msgid "User ID..."
msgstr "ID de usuário..."
-#: Src/wptKeyManagerDlg.cpp:1041
+#: Src/wptKeyManagerDlg.cpp:1046
msgid "Photo ID..."
msgstr "Foto-ID..."
-#: Src/wptKeyManagerDlg.cpp:1042
+#: Src/wptKeyManagerDlg.cpp:1047
msgid "Revoker..."
msgstr "Revogador..."
-#: Src/wptKeyManagerDlg.cpp:1045
+#: Src/wptKeyManagerDlg.cpp:1050
msgid "Key Attributes"
msgstr "Atributos da chave"
-#: Src/wptKeyManagerDlg.cpp:1046
+#: Src/wptKeyManagerDlg.cpp:1051
msgid "Add"
msgstr "Adicionar"
-#: Src/wptKeyManagerDlg.cpp:1047
+#: Src/wptKeyManagerDlg.cpp:1052
msgid "Send to Keyserver"
msgstr "Enviar a servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1323
+#: Src/wptKeyManagerDlg.cpp:1335
msgid ""
"No ultimately trusted key found.\n"
"Please set at least one secret key to ultimate trust."
@@ -3249,72 +3281,72 @@
"Nenhuma chave com confiança definitiva encontrada.\n"
"Por favor marque ao menos uma chave privada com confiança definitiva."
-#: Src/wptKeyManagerDlg.cpp:1352
+#: Src/wptKeyManagerDlg.cpp:1364
#, fuzzy
msgid "&Show"
msgstr "&Mostrar a fotografia"
-#: Src/wptKeyManagerDlg.cpp:1353
+#: Src/wptKeyManagerDlg.cpp:1365
#, fuzzy
msgid "&New..."
msgstr "&Abrir..."
-#: Src/wptKeyManagerDlg.cpp:1464
+#: Src/wptKeyManagerDlg.cpp:1477
msgid "Generate new key pair"
msgstr "Gerar novo par de chaves"
-#: Src/wptKeyManagerDlg.cpp:1468
+#: Src/wptKeyManagerDlg.cpp:1481
msgid "Search for a specific key"
msgstr "Localizar chave específica"
-#: Src/wptKeyManagerDlg.cpp:1472
+#: Src/wptKeyManagerDlg.cpp:1485
msgid "Delete key from keyring"
msgstr "Excluir chave do chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1476
+#: Src/wptKeyManagerDlg.cpp:1489
msgid "Show key properties"
msgstr "Exibir propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1480
+#: Src/wptKeyManagerDlg.cpp:1493
msgid "Sign key"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1484
+#: Src/wptKeyManagerDlg.cpp:1497
msgid "Copy key to clipboard"
msgstr "Copiar chave para área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1488
+#: Src/wptKeyManagerDlg.cpp:1501
msgid "Paste key from clipboard"
msgstr "Colar chave da área de transferência"
-#: Src/wptKeyManagerDlg.cpp:1492
+#: Src/wptKeyManagerDlg.cpp:1505
msgid "Import key to keyring"
msgstr "Importar chave para o chaveiro"
-#: Src/wptKeyManagerDlg.cpp:1496
+#: Src/wptKeyManagerDlg.cpp:1509
msgid "Export key to a file"
msgstr "Exportar chave para um arquivo"
-#: Src/wptKeyManagerDlg.cpp:1630
+#: Src/wptKeyManagerDlg.cpp:1643
msgid "New"
msgstr "Nova"
-#: Src/wptKeyManagerDlg.cpp:1642
+#: Src/wptKeyManagerDlg.cpp:1655
msgid "Could not access public keyring"
msgstr "Não foi possível acessar o chaveiro público"
-#: Src/wptKeyManagerDlg.cpp:1674 Src/wptKeysignDlg.cpp:325
+#: 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
msgid "Key Signing"
msgstr "Assinar chave"
-#: Src/wptKeyManagerDlg.cpp:1690
+#: Src/wptKeyManagerDlg.cpp:1703
msgid "Key already revoked!"
msgstr "Chave já revogada!"
-#: Src/wptKeyManagerDlg.cpp:1704 Src/wptKeyRevokeDlg.cpp:68
+#: Src/wptKeyManagerDlg.cpp:1717 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
@@ -3322,15 +3354,15 @@
msgid "Key Revocation Cert"
msgstr "Certificado de revogação da chave"
-#: Src/wptKeyManagerDlg.cpp:1726
+#: Src/wptKeyManagerDlg.cpp:1739
msgid "Key Signature List"
msgstr "Lista de assinaturas da chave"
-#: Src/wptKeyManagerDlg.cpp:1743 Src/wptKeyPropsDlg.cpp:281
+#: Src/wptKeyManagerDlg.cpp:1756 Src/wptKeyPropsDlg.cpp:281
msgid "Key Properties"
msgstr "Propriedades da chave"
-#: Src/wptKeyManagerDlg.cpp:1753
+#: Src/wptKeyManagerDlg.cpp:1766
msgid ""
"This is only useful when the keyring has been modified (sign a key...).\n"
"Do you really want to reload the keycache?"
@@ -3339,27 +3371,27 @@
"chave...).\n"
"Você realmente quer recarregar o cache de chaves?"
-#: Src/wptKeyManagerDlg.cpp:1783
+#: Src/wptKeyManagerDlg.cpp:1796
msgid "Smart Card support is not available."
msgstr "Suporte a Smart Card indisponível."
-#: Src/wptKeyManagerDlg.cpp:1806 Src/wptKeyserverDlg.cpp:577
+#: Src/wptKeyManagerDlg.cpp:1819 Src/wptKeyserverDlg.cpp:577
msgid "Keyserver Access"
msgstr "Acesso ao servidor de chaves"
-#: Src/wptKeyManagerDlg.cpp:1823
+#: Src/wptKeyManagerDlg.cpp:1836
msgid "GnuPG Options"
msgstr "Opções do GnuPG"
-#: Src/wptKeyManagerDlg.cpp:1865
+#: Src/wptKeyManagerDlg.cpp:1878
msgid "There is no corresponding secret key for this key."
msgstr "Não há chave privada correspondente a essa chave."
-#: Src/wptKeyManagerDlg.cpp:1870
+#: Src/wptKeyManagerDlg.cpp:1883
msgid "You can only export one secret key."
msgstr "Você só pode exportar uma chave secreta."
-#: Src/wptKeyManagerDlg.cpp:1875
+#: Src/wptKeyManagerDlg.cpp:1888
msgid ""
"This operation will export your *SECRET* key!\n"
"\n"
@@ -3377,15 +3409,15 @@
"\n"
"Você realmente deseja exportar essa chave?"
-#: Src/wptKeyManagerDlg.cpp:1880
+#: Src/wptKeyManagerDlg.cpp:1893
msgid "WARNING"
msgstr "ATENÇÃO"
-#: Src/wptKeyManagerDlg.cpp:1941
+#: Src/wptKeyManagerDlg.cpp:1954
msgid "No key was selected, select all by default."
msgstr "Nenhuma chave selecionada, selecionando todas por padrão."
-#: Src/wptKeyManagerDlg.cpp:1946
+#: Src/wptKeyManagerDlg.cpp:1959
#, fuzzy
msgid "Keyserver refresh finished."
msgstr "Procurando no servidor de chaves"
@@ -3493,8 +3525,9 @@
msgstr "Arquivo de saída"
#: Src/wptKeyRevokeDlg.cpp:134
+#, fuzzy
msgid ""
-"Please move this certificate to a medium where it can bestored in a safe "
+"Please move this certificate to a medium where it can be stored in a safe "
"place (floppy, CDR, etc..).\n"
"If an attacker gets access to this certificate he can use it to render your "
"key unusable!"
@@ -3571,7 +3604,7 @@
#: Src/wptKeyserver.cpp:678
#, fuzzy
msgid ""
-"Invalid proxy configuration.You need to set a user and a password to use "
+"Invalid proxy configuration. You need to set a user and a password to use "
"proxy authentication!"
msgstr ""
"Configuração de proxy inválida. Você precisa definir um usuário e uma senha "
@@ -3715,7 +3748,8 @@
msgstr "Enviar chave (padrão é receber)"
#: Src/wptKeyserverDlg.cpp:582
-msgid "Please enter the key ID or email address you search for"
+#, 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
@@ -3923,7 +3957,8 @@
msgstr "(2) Eu realizei uma verificação trivial."
#: Src/wptKeysignDlg.cpp:232
-msgid "(3) I have done very careful checkings."
+#, fuzzy
+msgid "(3) I have done very careful checking."
msgstr "(3) Eu verifiquei muito cuidadosamente."
#: Src/wptKeysignDlg.cpp:271
@@ -3994,59 +4029,59 @@
msgid "Trustlist"
msgstr "Lista de confiança"
-#: Src/wptMainProc.cpp:97
+#: Src/wptMainProc.cpp:104
msgid "Delete Clipboard Contents"
msgstr "Limpar área de transferência"
-#: Src/wptMainProc.cpp:99
+#: Src/wptMainProc.cpp:106
msgid "&Remember the answer"
msgstr "&Lembrar a resposta"
-#: Src/wptMainProc.cpp:101
+#: Src/wptMainProc.cpp:108
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:197
+#: Src/wptMainProc.cpp:204
msgid "Could not access secret keyring."
msgstr "Não foi possível acessar o chaveiro secreto."
-#: Src/wptMainProc.cpp:245 Src/wptTextInputDlg.cpp:79
+#: Src/wptMainProc.cpp:252 Src/wptTextInputDlg.cpp:79
msgid "Text Input"
msgstr "Entrada de texto"
-#: Src/wptMainProc.cpp:266
+#: Src/wptMainProc.cpp:273
msgid "Unknown OpenPGP type."
msgstr "Tipo desconhecido ao OpenPGP."
-#: Src/wptMainProc.cpp:344
+#: Src/wptMainProc.cpp:370
msgid "Could not set current window mode hooks."
msgstr ""
-#: Src/wptMainProc.cpp:406
+#: Src/wptMainProc.cpp:422
msgid "About..."
msgstr "Sobre..."
-#: Src/wptMainProc.cpp:412 Src/wptMainProc.cpp:416
+#: Src/wptMainProc.cpp:428 Src/wptMainProc.cpp:432
msgid "Decrypt/Verify"
msgstr "Decifrar/Verificar"
-#: Src/wptMainProc.cpp:427
+#: Src/wptMainProc.cpp:443
msgid "Current Window"
msgstr "Janela atual"
-#: Src/wptMainProc.cpp:485
+#: Src/wptMainProc.cpp:501
msgid "Remove all passphrases from cache?"
msgstr "Remover todas as frases secretas do cache?"
-#: Src/wptMainProc.cpp:486 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
+#: Src/wptMainProc.cpp:502 Src/wptProgressDlg.cpp:135 Src/wptRegistry.cpp:198
msgid "WinPT"
msgstr ""
-#: Src/wptMainProc.cpp:496
+#: Src/wptMainProc.cpp:512
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:529
+#: Src/wptMainProc.cpp:545
#, c-format
msgid ""
"Make sure that the window contains text.\n"
@@ -4055,7 +4090,7 @@
"Verifique se a janela contém texto.\n"
"%s."
-#: Src/wptMainProc.cpp:583 Src/wptPreferencesDlg.cpp:139
+#: Src/wptMainProc.cpp:599 Src/wptPreferencesDlg.cpp:139
msgid "WinPT Preferences"
msgstr "Preferências do WinPT"
@@ -4064,7 +4099,12 @@
msgid "MAPI Login failed"
msgstr "Login no MAPI falhou."
-#: Src/wptMAPI.cpp:140 Src/wptMAPI.cpp:263
+#: Src/wptMAPI.cpp:140
+#, fuzzy
+msgid "Could not send mail."
+msgstr "Não foi possível enviar a mensagem."
+
+#: Src/wptMAPI.cpp:263
msgid "Could not sent mail."
msgstr "Não foi possível enviar a mensagem."
@@ -4193,11 +4233,12 @@
msgstr "Por favor insira uma frase secreta."
#: Src/wptPassphraseDlg.cpp:144
+#, fuzzy
msgid ""
"Your passphrase should be at least 8 characters long\n"
"and should contain non-alphabetic characters.\n"
"\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"Sua frase secreta deveria ter no mínimo 8 caracteres\n"
"e conter caracteres não-alfabéticos.\n"
@@ -4209,7 +4250,7 @@
msgid ""
"The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters.\n"
-"Still proceed?"
+"Continue?"
msgstr ""
"A frase secreta contém caracteres de 8 bits.\n"
"Não é sugerito usar caracteres específicos a um conjunto."
@@ -4312,9 +4353,10 @@
msgstr "Não foi possível acessar o chaveiro secreto."
#: Src/wptPreferencesDlg.cpp:222
+#, fuzzy
msgid ""
"In most cases it is not a good idea to enable this setting.\n"
-"If you know what you are doing let this flag enabled, otherwise\n"
+"If you know what you are doing, you can enable this flag, otherwise\n"
"it is safe to leave this flag untouched."
msgstr ""
"Na maioria dos casos não é uma boa idéia ativar esta opção.\n"
@@ -4491,6 +4533,15 @@
msgid "Signed"
msgstr "Assinada"
+#~ msgid "Admin PIN must be minimal 8 characters."
+#~ msgstr "PIN do administrador deve ter no mínimo 8 caracteres."
+
+#~ msgid "PIN must be minimal 6 characters."
+#~ msgstr "PIN deve ter no mínimo 6 caracteres."
+
+#~ msgid "Change Passwd"
+#~ msgstr "Alterar senha"
+
#~ msgid "Edit Clipboard"
#~ msgstr "Editar área de transferência"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/ChangeLog 2006-07-28 11:11:09 UTC (rev 248)
@@ -1,3 +1,30 @@
+2007-07-28 Timo Schulz <ts at g10code.de>
+
+ * wptKeyManager.cpp (lv_del_confirmed_keys): New.
+ * wptKeyEditDlgs.cpp (keyedit_addsubkey_dlg_proc): Automatically
+ adjust key size.
+ * wptKeygenDlg.cpp (keygend_dlg_proc): Likewise.
+
+2006-07-25 Timo Schulz <ts at g10code.de>
+
+ Applied spelling corrections from Anthony Bryan.
+ * wptKeyserverDlg.cpp (keyserver_dlg_proc): Changed design.
+ * wptKeygenDlg.cpp (backup_keyrings): Change default keyring.
+
+2006-07-22 Timo Schulz <ts at g10code.de>
+
+ * wptMainProc.cpp (elgamal_warn_dlg_proc): Properly handle
+ utf8 encoded user ids.
+ (winpt_main_proc): Cleanups.
+ * wptKeyManagerDlg.cpp (keymanager_dlg_proc): Allow to copy
+ email address to the clipboard.
+
+2006-07-15 Timo Schulz <ts at g10code.de>
+
+ * WinPT.cpp (WinMain): Compare PTD and WinPT version to avoid
+ any compatibility problems.
+ * wptW32API.cpp (get_file_version): Cleanups.
+
2006-07-10 Timo Schulz <ts at g10code.de>
* wptUtil.cpp (check_file_name): New.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/WinPT-en.rc 2006-07-28 11:11:09 UTC (rev 248)
@@ -346,23 +346,23 @@
PUSHBUTTON "&Cancel",IDCANCEL,179,150,49,14
END
-IDD_WINPT_KEYSERVER DIALOG DISCARDABLE 0, 0, 209, 186
+IDD_WINPT_KEYSERVER DIALOG DISCARDABLE 0, 0, 187, 186
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Keyserver Access"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "List1",IDC_KEYSERVER_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING |
- WS_BORDER | WS_TABSTOP,6,5,194,100
- PUSHBUTTON "C&hange proxy",IDC_KEYSERVER_PROXSETT,138,106,61,13
- GROUPBOX "",IDC_STATIC,5,128,193,36
- LTEXT "Please enter the key ID or email address you search for",
- IDC_KEYSERVER_INFO,8,138,187,8
- EDITTEXT IDC_KEYSERVER_SEARCH,8,150,182,12,ES_AUTOHSCROLL
+ WS_BORDER | WS_TABSTOP,6,5,173,100
+ PUSHBUTTON "Set &default",IDC_KEYSERVER_DEFAULT,66,106,48,13
+ PUSHBUTTON "C&hange proxy",IDC_KEYSERVER_PROXSETT,117,106,61,13
+ GROUPBOX "",IDC_STATIC,5,128,171,36
+ LTEXT "Key ID or email address you want to search for",
+ IDC_KEYSERVER_INFO,8,136,166,8
+ EDITTEXT IDC_KEYSERVER_SEARCH,8,148,162,12,ES_AUTOHSCROLL
DEFPUSHBUTTON "&Receive",IDC_KEYSERVER_RECV,5,169,46,14
PUSHBUTTON "&Search",IDC_KEYSERVER_INDEX,53,169,36,14
- PUSHBUTTON "Set &default",IDC_KEYSERVER_DEFAULT,107,169,48,14
- PUSHBUTTON "&Close",IDCANCEL,157,169,45,14
+ PUSHBUTTON "&Close",IDCANCEL,130,167,45,14
END
IDD_WINPT_SIGN DIALOG DISCARDABLE 0, 0, 299, 125
@@ -377,7 +377,7 @@
PUSHBUTTON "&Cancel",IDCANCEL,242,103,50,14
END
-IDD_WINPT_KEYGEN DIALOG DISCARDABLE 0, 0, 188, 167
+IDD_WINPT_KEYGEN DIALOG DISCARDABLE 0, 0, 193, 167
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Key Generation"
FONT 8, "MS Sans Serif"
@@ -385,24 +385,24 @@
LTEXT "NOTE: Key generation can be a lengthy process! Please wait until you get the message that key generation was finished.",
IDC_KEYGEN_INFO,8,10,157,24
LTEXT "Key &type",IDC_KEYGEN_KEYTYPEINF,8,43,49,10
- COMBOBOX IDC_KEYGEN_KEYTYPE,74,42,107,61,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_KEYGEN_KEYTYPE,79,42,107,61,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- LTEXT "Subkey size in &bits",IDC_KEYGEN_SUBKEYINF,8,61,59,8
- EDITTEXT IDC_KEYGEN_SUBKEYBITS,74,58,20,14
- LTEXT "1024-4096",IDC_STATIC,99,60,35,8
+ LTEXT "Subkey size in &bits",IDC_KEYGEN_SUBKEYINF,8,61,68,8
+ EDITTEXT IDC_KEYGEN_SUBKEYBITS,79,58,20,14
+ LTEXT "1024-4096",IDC_STATIC,103,60,35,8
LTEXT "&Real name",IDC_KEYGEN_NAMEINF,8,79,57,8
- EDITTEXT IDC_KEYGEN_NAME,74,76,107,13,ES_AUTOHSCROLL
+ EDITTEXT IDC_KEYGEN_NAME,79,76,107,13,ES_AUTOHSCROLL
LTEXT "&Comment (optional)",IDC_KEYGEN_COMMINF,8,96,61,8
- EDITTEXT IDC_KEYGEN_COMMENT,74,93,107,13,ES_AUTOHSCROLL
+ EDITTEXT IDC_KEYGEN_COMMENT,79,93,107,13,ES_AUTOHSCROLL
LTEXT "Email &address",IDC_KEYGEN_EMAILINF,8,112,55,8
- EDITTEXT IDC_KEYGEN_EMAIL,74,109,107,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_KEYGEN_EMAIL,79,109,107,12,ES_AUTOHSCROLL
LTEXT "&Expire date",IDC_KEYGEN_EXPINF,8,126,53,8
CONTROL "&Never",IDC_KEYGEN_EXPNEVER,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,75,127,44,10
+ WS_TABSTOP,79,127,44,10
CONTROL "DateTimePicker1",IDC_KEYGEN_EXPDATE,"SysDateTimePick32",
DTS_RIGHTALIGN | WS_TABSTOP,126,125,54,12
- DEFPUSHBUTTON "&Start",IDOK,80,148,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,132,148,50,14
+ DEFPUSHBUTTON "&Start",IDOK,82,148,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,135,148,50,14
END
IDD_WINPT_SIGNENC DIALOG DISCARDABLE 0, 0, 384, 194
@@ -549,9 +549,9 @@
BEGIN
EDITTEXT IDC_GPGOPT_FILE,6,6,318,111,ES_MULTILINE | ES_WANTRETURN |
WS_VSCROLL
- PUSHBUTTON "&Load",IDC_GPGOPT_LOAD,165,122,52,14
- PUSHBUTTON "&Save",IDC_GPGOPT_SAVE,221,122,47,14
- PUSHBUTTON "&OK",IDCANCEL,273,122,50,14
+ PUSHBUTTON "&Load",IDC_GPGOPT_LOAD,161,122,52,14
+ PUSHBUTTON "&Save",IDC_GPGOPT_SAVE,217,122,47,14
+ PUSHBUTTON "&Exit",IDCANCEL,273,122,50,14
END
IDD_WINPT_KEYSIG DIALOG DISCARDABLE 0, 0, 351, 170
@@ -1459,7 +1459,7 @@
IDD_WINPT_KEYSERVER, DIALOG
BEGIN
LEFTMARGIN, 3
- RIGHTMARGIN, 204
+ RIGHTMARGIN, 182
TOPMARGIN, 3
BOTTOMMARGIN, 182
END
@@ -1475,7 +1475,7 @@
IDD_WINPT_KEYGEN, DIALOG
BEGIN
LEFTMARGIN, 3
- RIGHTMARGIN, 181
+ RIGHTMARGIN, 186
TOPMARGIN, 4
BOTTOMMARGIN, 162
END
@@ -2134,6 +2134,7 @@
POPUP "Key Attributes"
BEGIN
MENUITEM "Copy User ID to Clipboard", ID_KEYCTX_UID_COPY
+ MENUITEM "Copy E-Mail to Clipboard", ID_KEYCTX_EMAIL_COPY
MENUITEM "Copy Key ID to Clipboard", ID_KEYCTX_KEYID_COPY
MENUITEM "Copy Fingerprint to Clipboard", ID_KEYCTX_FPR_COPY
MENUITEM "Copy Key Info to Clipboard", ID_KEYCTX_KINFO_COPY
Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/WinPT.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -293,9 +293,9 @@
do not show any errors. */
static int
load_keyserver_conf (int quiet)
-{
- char *buf;
+{
const char *t, *conf;
+ char *buf;
int rc;
/* Create $APPDATA\winpt if needed. */
@@ -448,11 +448,12 @@
HACCEL accel_tab;
MSG msg;
HWND hwnd = NULL;
+ WORD ver[3], ptdver[4];
+ const char *s;
int rc, ec, created = 0;
int first_start = 0, start_gpgprefs = 0;
int winpt_inst_found = 0;
- int start_manager = 0;
- const char *s;
+ int start_manager = 0;
glob_hinst = hinst;
if (cmdline && stristr (cmdline, "--stop")) {
@@ -467,20 +468,17 @@
debug = 1;
#endif
- /* XXX
- WORD ver[3], ptdver[4];
get_file_version ("WinPT.exe", &ver[0], &ver[1], &ver[2], &ver[3]);
- get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],
+ ec = get_file_version ("PTD.dll", &ptdver[0], &ptdver[1],
&ptdver[2], &ptdver[3]);
- if (ptdver[0] != ver[0] || ptdver[1] != ver[1]|| ptdver[2] != ver[2]) {
+ if (!ec && (ptdver[0] != ver[0] || ptdver[1] != ver[1]|| ptdver[2] != ver[2])) {
log_box (_("WinPT Error"), MB_ERR,
_("The PTD.dll file has a different version than WinPT.exe\n"
"Please update the PTD.dll to version %d.%d.%d"),
ver[0], ver[1], ver[2]);
return 0;
}
- */
if (gpg_md_selftest ()) {
msg_box (NULL, _("Cryptographic selftest failed."),
@@ -583,7 +581,7 @@
ec = msg_box (NULL,
_("Could not access and/or find the public and secret keyring.\n"
"If this is an accident, quit the program and fix it.\n\n"
- "Continue if you want that WinPT offers you more choices.\n"),
+ "Continue if you want WinPT to offer you more choices.\n"),
"WinPT", MB_INFO|MB_YESNO);
if (ec == IDYES)
first_start = 1;
@@ -748,7 +746,7 @@
msg_box (hwnd, _("The keycache was not initialized or is empty.\n"
"Please check your GPG config (keyrings, pathes...)"),
_("WinPT Error"), MB_ERR);
- ec = msg_box (NULL, _("It seems that GPG is not set properly.\n"
+ ec = msg_box (NULL, _("It seems that GPG is not configured properly.\n"
"Do you want to start the GPG preferences dialog?"),
"WinPT", MB_INFO|MB_YESNO);
if (ec == IDYES) {
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/resource.h 2006-07-28 11:11:09 UTC (rev 248)
@@ -845,13 +845,14 @@
#define ID_CLIPEDIT_QUOTE 40194
#define ID_CLIPEDIT_ENC 40195
#define ID_CLIPEDIT_DEC 40196
+#define ID_KEYCTX_EMAIL_COPY 40197
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 251
-#define _APS_NEXT_COMMAND_VALUE 40197
+#define _APS_NEXT_COMMAND_VALUE 40198
#define _APS_NEXT_CONTROL_VALUE 1537
#define _APS_NEXT_SYMED_VALUE 101
#endif
Modified: trunk/Src/wptCardDlg.cpp
===================================================================
--- trunk/Src/wptCardDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptCardDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -152,7 +152,7 @@
memset (&key, 0, sizeof (key));
winpt_get_pubkey (card->fpr[1]+32, &key);
if (key.ext) {
- key.ext->card_type = strdup (card->card_type);
+ key.ext->card_type = m_strdup (card->card_type);
if (!key.ext->card_type)
BUG (NULL);
/* memory will be released in gpg_keycache_release (). */
@@ -503,7 +503,7 @@
if (item_get_text_length (dlg, IDC_CEDIT_FPR1) > 0) {
int id = msg_box (dlg,
_("This operation will override the keys on the card.\n"
- "Still proceed?"), _("Card Edit"), MB_WARN|MB_YESNO);
+ "Continue?"), _("Card Edit"), MB_WARN|MB_YESNO);
if (id == IDNO)
return TRUE;
}
@@ -660,7 +660,7 @@
SYSTEMTIME st, ct;
DateTime_GetSystemtime (GetDlgItem (dlg, IDC_CKEYGEN_VALID), &st);
if (!keygen_check_date (&st)) {
- msg_box (dlg, _("The date you have chosen lies in the past."),
+ msg_box (dlg, _("The date you have chosen has already passed."),
_("Card Edit"), MB_ERR);
free_pincb (&pincb);
delete ce;
@@ -728,12 +728,12 @@
}
if (which == CARD_ADMIN_PIN
&& pinlen < 8) {
- msg_box (NULL, _("Admin PIN must be minimal 8 characters."), _("Card Edit"), MB_ERR);
+ msg_box (NULL, _("Admin PIN must be at least 8 characters."), _("Card Edit"), MB_ERR);
return -1;
}
if (which == CARD_USER_PIN
&& pinlen < 6) {
- msg_box (NULL, _("PIN must be minimal 6 characters."), _("Card Edit"), MB_ERR);
+ msg_box (NULL, _("PIN must be at least 6 characters."), _("Card Edit"), MB_ERR);
return -1;
}
return 0;
Modified: trunk/Src/wptClipDecryptDlg.cpp
===================================================================
--- trunk/Src/wptClipDecryptDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptClipDecryptDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -257,7 +257,7 @@
_("WARNING: encrypted message has been manipulated!\n"
"\n"
"Do *NOT* trust any text or data output from this file!\n"
- "It is likely, the data was corrupted during the transport\n"
+ "It is likely that the data was corrupted in transport\n"
"but it might be also possible that this is part of an attack.");
msg_box (hwnd, s, _("*** IMPORTANT ***"), MB_INFO);
}
Modified: trunk/Src/wptClipEditDlg.cpp
===================================================================
--- trunk/Src/wptClipEditDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptClipEditDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -120,7 +120,7 @@
if (GetOpenFileName (&open)) {
if( (size=get_file_size (file)) > MAX_CLIPTEXT_SIZE) {
id = msg_box (dlg, _("The file you want to add is very large.\n"
- "Still proceed?"), _("Clipboard"),
+ "Continue?"), _("Clipboard"),
MB_INFO|MB_YESNO);
if (id == IDNO)
return -1;
Modified: trunk/Src/wptErrors.cpp
===================================================================
--- trunk/Src/wptErrors.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptErrors.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -49,7 +49,7 @@
case WPTERR_GPG_OPT_KEYRINGS:
case WPTERR_GPG_KEYRINGS:
_snprintf( buf, sizeof buf - 1,
- _("Could not find keyring entries into the options file in %s "
+ _("Could not find keyring entries in the config file in %s "
"or the file does NOT exist."), path );
break;
}
Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptFileManager.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -193,7 +193,7 @@
if (i == -1)
{
ans = msg_box (NULL, _("Multi-Media files are already compressed, GPG would compress\n"
- "them anyway and this costs a lot of time.\n"
+ "them anyway and this takes a lot of time.\n"
"It is possible to disable compression for these files.\n"
"Do you want to disable it?"),
_("File Manager"), MB_YESNO|MB_INFO);
Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptGPG.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -92,11 +92,9 @@
char *path;
path = get_reg_entry_gpg (GPG_REG_HOME);
- if (path) {
- if (dir_exist_check (path) == 0)
- return path;
- free_if_alloc (path);
- }
+ if (path && dir_exist_check (path) == 0)
+ return path;
+ free_if_alloc (path);
path = multi_gnupg_path (1);
return path;
}
@@ -162,26 +160,20 @@
/* Return the full path (with the gpg exe name). First the registry is scanned
for the entry 'gpgProgram'. If it wasn't set, the default path is the
appended string 'gpg.exe' is used. */
-
-/* FIXME: Use gpgme's engine info here. */
char*
get_gnupg_prog (void)
{
- char *p;
- char *pgm = NULL;
+ char *path;
+ char *pgm;
- p = get_reg_entry_gpg (GPG_REG_EXE);
- if (!p) {
- char *path = get_gnupg_path ();
- if (!path)
- return NULL;
- pgm = make_filename (path, "gpg", "exe");
- free_if_alloc (path);
- }
- else {
- pgm = m_strdup (p);
- free_if_alloc (p);
- }
+ pgm = get_reg_entry_gpg (GPG_REG_EXE);
+ if (pgm)
+ return pgm;
+ path = get_gnupg_path ();
+ if (!path)
+ return NULL;
+ pgm = make_filename (path, "gpg", "exe");
+ free_if_alloc (path);
return pgm;
}
@@ -198,8 +190,6 @@
char *keyid = NULL;
sec = keycache_get_ctx (0);
- if (!sec)
- BUG (0);
pub = keycache_get_ctx (1);
gpg_keycache_rewind (sec);
while (!gpg_keycache_next_key (sec, 1, &key)) {
@@ -211,7 +201,7 @@
}
}
if (!keyid)
- *ret_no_useable = 1;
+ *ret_no_useable = 1;
return keyid;
}
@@ -377,8 +367,10 @@
}
/* We need to exec GPG again to find out if IDEA is available. */
- if (gpg_get_version (&eng))
+ if (gpg_get_version (&eng)) {
+ gpgme_release (ctx);
return -1;
+ }
if (strstr (eng, "IDEA"))
idea_available = 1;
safe_free (eng);
@@ -412,9 +404,9 @@
*r_secrings = 0;
*r_pubrings = 0;
+
if (parse_gpg_options (fname, &opt))
return WPTERR_FILE_OPEN;
-
for (e = opt->list; e; e = e->next) {
if (!strcmp( e->name, "secret-keyring")) {
if (!file_exist_check (e->val))
@@ -598,50 +590,51 @@
/* Set the contents of the options file. */
int
-set_gnupg_options( const char *buf, size_t buflen )
+set_gnupg_options (const char *buf, size_t buflen)
{
FILE *fp;
char *optfile = NULL;
- optfile = get_gnupg_cfgfile( );
- if( optfile == NULL )
+ optfile = get_gnupg_cfgfile ();
+ if (!optfile)
return WPTERR_FILE_CREAT;
- fp = fopen( optfile, "wb" );
- if( fp == NULL ) {
- free_if_alloc( optfile );
+ fp = fopen (optfile, "wb");
+ if (!fp) {
+ free_if_alloc (optfile);
return WPTERR_FILE_CREAT;
}
- fwrite( buf, 1, buflen, fp );
- fclose( fp );
- free_if_alloc( optfile );
+ fwrite (buf, 1, buflen, fp);
+ fclose (fp);
+ free_if_alloc (optfile);
return 0;
-} /* set_gnupg_options */
+}
+
/*
* Check if the line contains a valid GPG argument.
*/
static int
-check_line( const char *buf )
+check_line (const char *buf)
{
int j, len;
int rc = 0;
- if( *buf == '#' || *buf == '\r' || *buf == '\n' )
+ if (*buf == '#' || *buf == '\r' || *buf == '\n')
return 1;
rc = 0;
- for ( j = 0; valid_gpg_args[j]; j++ ) {
- len = strlen( valid_gpg_args[j] );
- if( !strncmp( valid_gpg_args[j], buf, len ) )
- rc = 1;
+ for (j = 0; valid_gpg_args[j]; j++) {
+ len = strlen (valid_gpg_args[j]);
+ if (!strncmp (valid_gpg_args[j], buf, len))
+ rc = 1;
}
return rc;
-} /* check_line */
+}
int
-check_gnupg_options( const char *buf )
+check_gnupg_options (const char *buf)
{
char line[1024];
int nbytes = 0;
@@ -660,7 +653,7 @@
}
return 0;
-} /* check_gnupg_options */
+}
/* Store the last access of the file inside the watcher @ctx. */
@@ -717,8 +710,6 @@
for (j = 0; j < gpg_table_count; j++) {
p = gpg_table[j].object = m_strdup (gpg_objs[j]);
- if (!p)
- BUG (NULL);
memset (&gpg_table[j].access, 0, sizeof (FILETIME));
memset (&gpg_table[j].last_access, 0, sizeof (FILETIME));
gpg_table[j].modified = 0;
@@ -1081,13 +1072,11 @@
FILE *fp;
dstpath = m_strdup (reg_prefs.backup.path);
- if (!dstpath)
- BUG (0);
tmpfile = make_filename (reg_prefs.backup.path, "test", "tmp");
fp = fopen (tmpfile, "wb");
if (!fp)
rc = log_box (_("Backup"), MB_WARN|MB_RETRYCANCEL,
- _("The backup drive '%s' does not seems to accessable.\n"
+ _("The backup drive '%s' does not seems to be accessable.\n"
"Please insert/check the drive to continue."), dstpath);
else {
rc = 0;
Modified: trunk/Src/wptGPGOptDlg.cpp
===================================================================
--- trunk/Src/wptGPGOptDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptGPGOptDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -54,6 +54,7 @@
SetWindowText (dlg, _("GnuPG Configuration File" ));
SetDlgItemText (dlg, IDC_GPGOPT_SAVE, _("&Save"));
SetDlgItemText (dlg, IDC_GPGOPT_LOAD, _("&Load"));
+ SetDlgItemText (dlg, IDCANCEL, _("&Exit"));
free_if_alloc (optbuf);
SetForegroundWindow (dlg);
return TRUE;
Modified: trunk/Src/wptImportList.cpp
===================================================================
--- trunk/Src/wptImportList.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptImportList.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -417,7 +417,7 @@
if (check_import_data (file, r_revcerts)) {
msg_box (NULL, _("It is possible that the ASCII-Armor is damaged\n"
- "and thus a CRC error occurs."),
+ "and thus causing a CRC error."),
_("Import"), MB_ERR);
if (is_tmp)
DeleteFile (file);
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyEditDlgs.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -353,7 +353,7 @@
cb = (keyedit_cb_t)lparam;
if (!cb)
BUG (NULL);
- SetDlgItemText (dlg, IDC_ADDPHOTO_INF, _("Remember that the image is stored within your public key. If you use a very large picture, your key will become very large as well! Keeping the image close to 240x288 is a good size to use."));
+ SetDlgItemText (dlg, IDC_ADDPHOTO_INF, _("Remember that the image is stored within your public key. If you use a very large picture, your key will become very large as well! Keeping the image close to 240x288 is advised."));
SetDlgItemText (dlg, IDC_ADDPHOTO_FILEINF, _("Pick an image to use for your photo ID.\nThe image must be a JPEG file."));
SetDlgItemText (dlg, IDC_ADDPHOTO_PWDINF, _("Passphrase"));
SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
@@ -663,8 +663,8 @@
if (HIWORD (wparam) == LBN_SELCHANGE &&
LOWORD (wparam) == IDC_ADDSUBKEY_ALGO) {
index = SendMessage ((HWND)lparam, LB_GETCURSEL, 0, 0);
- if (index == 0)
- SendDlgItemMessage (dlg, IDC_ADDSUBKEY_SIZE, CB_SETCURSEL, 0, 0);
+ SendDlgItemMessage (dlg, IDC_ADDSUBKEY_SIZE, CB_SETCURSEL,
+ index==0? 0 : 2, 0);
}
switch (LOWORD (wparam)) {
@@ -1035,7 +1035,7 @@
if (strlen (new_pass) == 0) {
cancel = msg_box (dlg, _("Are you sure that you really don't want a passphrase?\n"
- "This is propably a bad idea, still proceed?"),
+ "This is propably a bad idea, continue?"),
_("Key Edit"), MB_WARN_ASK);
if (cancel != IDYES) {
sfree_if_alloc (old_pass);
@@ -1050,7 +1050,7 @@
ke->setNoPassphrase (true);
err = ke->changePassphrase (new_pass, 1);
if (err)
- msg_box (dlg, gpgme_strerror (err), _("Change Passwd"), MB_ERR);
+ msg_box (dlg, gpgme_strerror (err), _("Change Password"), MB_ERR);
else
msg_box (dlg, _("Passphrase successfully changed."), _("GnuPG status"), MB_OK);
sfree_if_alloc (old_pass);
@@ -1245,7 +1245,7 @@
"ADDUID add a user ID\r\n"
"ADDPHOTO add a photo ID\r\n"
"DELUID delete a user ID\r\n"
- "ADDKEY add a secondard key\r\n"
+ "ADDKEY add a secondary key\r\n"
"DELKEY delete a secondary key\r\n"
"ADDREVOKER add a revocation key\r\n"
"EXPIRE change the expire date\r\n"
@@ -1360,7 +1360,7 @@
if (udd.cancel == 1)
return FALSE;
if (!keygen_check_date (&udd.st)) {
- msg_box (dlg, _("The date you have chosen lies in the past."),
+ msg_box (dlg, _("The date you have chosen has already passed."),
_("Key Edit"), MB_ERR);
return FALSE;
}
@@ -2057,7 +2057,7 @@
warn = _("Your keys is listed as a designated revoker for the key\n\n"
"%s\n\n"
"Are you sure you want to create a revocation certificate\n"
- "which allow to revoke the key listed above?");
+ "which allows you to revoke the key listed above?");
p = new char[strlen (inf)+1+strlen (warn)+1];
sprintf (p, warn, inf);
free_if_alloc (inf);
Modified: trunk/Src/wptKeyEditOwnertrustDlg.cpp
===================================================================
--- trunk/Src/wptKeyEditOwnertrustDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyEditOwnertrustDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -63,7 +63,7 @@
_("Please decide how far you trust this user to "
"correctly verify other users' keys (by looking "
"at passports, checking fingerprint from "
- "different source...)?"));
+ "different sources...)?"));
SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
center_window (dlg, NULL);
SetForegroundWindow (dlg);
Modified: trunk/Src/wptKeyManager.cpp
===================================================================
--- trunk/Src/wptKeyManager.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyManager.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -449,7 +449,7 @@
return WPTERR_NODATA;
}
if (pgptype & PGP_DASH_ESCAPED) {
- id = msg_box (dlg, _("The key you want to import is dash escacped.\n"
+ id = msg_box (dlg, _("The key you want to import is dash escaped.\n"
"Do you want to extract the key?"),
_("Key Manager"), MB_YESNO);
if (id == IDYES)
@@ -685,6 +685,26 @@
}
+/* Delete the list view items which match a key ptr
+ inside the @rset array. */
+static void
+lv_del_confirmed_keys (listview_ctrl_t lv, gpgme_key_t *rset)
+{
+ winpt_key_s key2;
+ int j, i, n = listview_count_items (lv, 0);
+
+ for (i=0; i < n; i++) {
+ if (listview_get_item_state (lv, i)) {
+ km_get_key (lv, i, &key2);
+ for (j=0; rset[j] != NULL; j++) {
+ if (rset[j] == key2.ctx)
+ listview_del_item (lv, i);
+ }
+ }
+ }
+}
+
+
/* Delete all selected keys from the list view @lv. */
int
km_delete_keys (listview_ctrl_t lv, HWND dlg)
@@ -780,9 +800,9 @@
if (n == 0)
show_msg (dlg, 1500, _("GnuPG Status: Finished"));
gpgme_release (ctx);
- listview_del_sel_items (lv);
+ lv_del_confirmed_keys (lv, rset);
delete_keys_from_cache (rset, k_pos);
- free (rset);
+ safe_free (rset);
if (with_seckey)
check_exist_default_key ();
return (int)err;
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyManagerDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -88,13 +88,14 @@
typedef struct km_info_s *km_info_t;
/* Toolbar button structure. */
-struct mybuttons {
+struct tb_button_s {
long icon;
long command;
char *text;
};
-struct mybuttons myb[] = {
+/* The buttons in the toolbar. */
+struct tb_button_s tbb[] = {
{IMI_KEY_DELETE, ID_KEYMISC_DELETE, "Delete"},
{IMI_KEY_PROPS, ID_KEYMISC_PROPS, "Properties"},
{IMI_KEY_SIGN, ID_KEYMISC_SIGN, "Sign"},
@@ -223,10 +224,10 @@
{
WORD *buf;
HKEY root;
- DWORD type;
- DWORD size = kmi->lv->cols*sizeof (WORD), i;
+ DWORD type, size, i;
LONG ec;
+ size = kmi->lv->cols*sizeof (WORD);
ec = RegOpenKeyEx (HKEY_CURRENT_USER, "Software\\WinPT", 0,
KEY_ALL_ACCESS, &root);
if (ec != ERROR_SUCCESS)
@@ -518,7 +519,8 @@
void
update_status_bar (HWND sb, listview_ctrl_t lv)
{
- char txt_sec[128], txt_pub[128];
+ char txt_sec[128];
+ char txt_pub[128];
int nkeys = 0, nsec = 0;
int i;
@@ -538,6 +540,9 @@
separator_wnd_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
{
static POINT last_mouse_pos;
+ PAINTSTRUCT ps;
+ RECT rect;
+ HPEN hpen;
if (msg == WM_CREATE)
SetWindowLong (hwnd, GWL_USERDATA,
@@ -545,10 +550,6 @@
switch (msg) {
case WM_PAINT:
- PAINTSTRUCT ps;
- RECT rect;
- HPEN hpen;
-
GetClientRect (hwnd, &rect);
BeginPaint (hwnd, &ps);
@@ -604,7 +605,6 @@
if (wparam == MK_LBUTTON) {
struct km_info_s *kmi;
POINT p;
- RECT r;
kmi = (struct km_info_s *)GetWindowLong (hwnd, GWL_USERDATA);
if (kmi == NULL)
@@ -615,16 +615,16 @@
p.y = HIWORD (lparam);
ClientToScreen (hwnd, &p);
- GetWindowRect (hwnd, &r);
- r.top += (short)(p.y - last_mouse_pos.y);
- r.bottom += (short)(p.y - last_mouse_pos.y);
+ GetWindowRect (hwnd, &rect);
+ rect.top += (short)(p.y - last_mouse_pos.y);
+ rect.bottom += (short)(p.y - last_mouse_pos.y);
last_mouse_pos.y = p.y;
/* Apply mouse movement to window. Beware the MoveWindow is relaive
to parent NOT screen */
- MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&r, 2);
- kmi->ypos_sep = r.top;
+ MapWindowPoints (NULL, GetParent(hwnd), (POINT*)&rect, 2);
+ kmi->ypos_sep = rect.top;
kmi->ypercent_sep = 0; /* This forces do_resize_window to use abs. position */
do_resize_window (GetParent (hwnd), kmi);
return 0;
@@ -642,6 +642,7 @@
WNDCLASS wndclass;
HWND h;
+ memset (&wndclass, 0, sizeof (wndclass));
wndclass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
wndclass.lpfnWndProc = separator_wnd_proc;
wndclass.cbClsExtra = 0;
@@ -656,7 +657,9 @@
h = CreateWindowEx (WS_EX_WINDOWEDGE, WINDOWCLASS_SEPARATOR_CHILD, NULL,
WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,
- 0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
+ 0, 400, 2000, 5, dlg, (HMENU) 0, glob_hinst, kmi);
+ if (!h)
+ BUG (NULL);
ShowWindow (h, SW_SHOW);
return h;
}
@@ -676,8 +679,8 @@
HMENU hmenu;
int mult_resids[] = {ID_KEYMISC_PROPS, ID_KEYMISC_SIGN, ID_KEYMISC_EDITKEY,
ID_KEYMISC_CHECKSIGS, ID_KEYMISC_REVCERT, 0};
- int key_selected = 0;
- int key_has_sec = 0;
+ int key_selected;
+ int key_has_sec;
int key_inv = 0;
int i, state=0;
@@ -878,14 +881,14 @@
for (i=1; i <= 3; i++)
partpos[i-1] = r.right/3*i;
statbar = CreateStatusWindow (WS_CHILD | WS_VISIBLE | CCS_BOTTOM,
- "status bar", dlg, KM_SEPARATOR_ID);
-
+ "WinPT_Status_Bar", dlg, KM_SEPARATOR_ID);
+ if (!statbar)
+ BUG (NULL);
ShowWindow (statbar, SW_SHOW);
SendMessage (statbar, SB_SETPARTS, (WPARAM)3, (LPARAM)partpos);
update_default_key_str (statbar);
update_status_bar (statbar, lv);
-
return statbar;
}
@@ -955,6 +958,7 @@
return file_exist_check (path) == 0? true : false;
}
+
/* Translate all menu strings. */
static void
translate_menu_strings (HWND dlg)
@@ -1019,6 +1023,7 @@
set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));
set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));
set_menu_text (popup, ID_KEYCTX_KINFO_COPY, _("Copy Key Info to Clipboard"));
+ set_menu_text (popup, ID_KEYCTX_EMAIL_COPY, _("Copy E-Mail to Clipboard"));
set_menu_text (popup, ID_KEYCTX_COPY, _("Copy Key to Clipboard"));
set_menu_text (popup, ID_KEYCTX_PASTE, _("Paste Key from Clipboard"));
set_menu_text (popup, ID_KEYCTX_RECVFROM, _("Refresh from Keyserver"));
@@ -1067,7 +1072,7 @@
static int
find_keypos (listview_ctrl_t lv, gpgme_key_t key)
{
- char keyid[16+1];
+ char keyid[32+1];
int i;
for (i=0; i < listview_count_items (lv, 0); i++) {
@@ -1235,6 +1240,13 @@
if (!listview_get_item_state (kmi->lv, i))
continue;
switch (what) {
+
+ case ID_KEYCTX_EMAIL_COPY:
+ key = km_get_key_ptr (kmi->lv, i, NULL);
+ gpgme_data_write (out, key->uids->email, strlen (key->uids->email));
+ if (!single) gpgme_data_write (out, "\r\n", 2);
+ break;
+
case ID_KEYCTX_UID_COPY:
key = km_get_key_ptr (kmi->lv, i, &kci);
gpgme_data_write (out, kci->uids->uid, strlen (kci->uids->uid));
@@ -1383,7 +1395,8 @@
set_reg_entry (HKEY_CURRENT_USER, "Software\\WinPT", "KM_Size_Height",
type);
- /* Remove runtime information. This should be the last action taken here. */
+ /* Remove runtime information.
+ This should be the last action taken here. */
delete kmi;
kmi = NULL;
SetWindowLong (dlg, GWL_USERDATA, 0);
@@ -1420,13 +1433,13 @@
case TBN_GETBUTTONINFO:
LPTBNOTIFY lpTbNotify;
lpTbNotify = (LPTBNOTIFY)lparam;
- if (lpTbNotify->iItem < (sizeof(myb) / sizeof(mybuttons))) {
- lpTbNotify->tbButton.iBitmap = imagelist_getindex (myb[lpTbNotify->iItem].icon);
- lpTbNotify->tbButton.idCommand = myb[lpTbNotify->iItem].command;
+ if (lpTbNotify->iItem < (sizeof(tbb) / sizeof(tb_button_s))) {
+ lpTbNotify->tbButton.iBitmap = imagelist_getindex (tbb[lpTbNotify->iItem].icon);
+ lpTbNotify->tbButton.idCommand = tbb[lpTbNotify->iItem].command;
lpTbNotify->tbButton.fsState = TBSTATE_ENABLED;
lpTbNotify->tbButton.fsStyle = TBSTYLE_BUTTON;
lpTbNotify->tbButton.iString = 0;
- strncpy (lpTbNotify->pszText, myb[lpTbNotify->iItem].text, lpTbNotify->cchText);
+ strncpy (lpTbNotify->pszText, tbb[lpTbNotify->iItem].text, lpTbNotify->cchText);
SetWindowLong(dlg, DWL_MSGRESULT, TRUE);
}
return TRUE;
@@ -2019,6 +2032,7 @@
case ID_KEYCTX_KEYID_COPY:
case ID_KEYCTX_FPR_COPY:
case ID_KEYCTX_KINFO_COPY:
+ case ID_KEYCTX_EMAIL_COPY:
copy_key_info (LOWORD (wparam), kmi);
break;
Modified: trunk/Src/wptKeyRevokeDlg.cpp
===================================================================
--- trunk/Src/wptKeyRevokeDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyRevokeDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -131,7 +131,7 @@
char *desc=NULL;
char *inp_data = NULL, *revcert=NULL;
const char *warning =
- _("Please move this certificate to a medium where it can be"
+ _("Please move this certificate to a medium where it can be "
"stored in a safe place (floppy, CDR, etc..).\n"
"If an attacker gets access to this certificate he can use it to "
"render your key unusable!");
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeygenDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -291,7 +291,7 @@
_("WARNING - Important hint" ), MB_YESNO);
if (id == IDYES) {
name = get_filesave_dlg (dlg, _("Destination for Public Keyring"),
- NULL, "pubring.gpg");
+ NULL, "pubring_bak.gpg");
if( name ) {
keyring = make_filename (path, "pubring", "gpg");
if (!CopyFile (keyring, name, FALSE))
@@ -300,7 +300,7 @@
free_if_alloc (keyring);
}
name = get_filesave_dlg (dlg, _("Destination for Secret Keyring"),
- NULL, "secring.gpg");
+ NULL, "secring_bak.gpg");
if (name) {
keyring = make_filename (path, "secring", "gpg");
if (!CopyFile (keyring, name, FALSE))
@@ -371,7 +371,7 @@
SetWindowText (dlg, _("Key Generation"));
SetDlgItemText(dlg, IDC_KEYGEN_INFO,
_("NOTE: Key generation can be a lengthy process! Please wait until "
- "you get the message that key generation was finished."));
+ "you get the message that key generation has finished."));
SetDlgItemText (dlg, IDC_KEYGEN_SUBKEYINF, _("Subkey size in &bits"));
SetDlgItemText (dlg, IDC_KEYGEN_NAMEINF, _("&Real name"));
SetDlgItemText (dlg, IDC_KEYGEN_COMMINF, _("&Comment (optional)"));
@@ -391,6 +391,17 @@
return TRUE;
case WM_COMMAND:
+ if (HIWORD (wparam) == CBN_SELCHANGE &&
+ LOWORD (wparam) == IDC_KEYGEN_KEYTYPE) {
+ keytype = SendMessage ((HWND)lparam, CB_GETCURSEL, 0, 0);
+
+ if (keytype == GPG_KEYGEN_DSA_SIG-1)
+ bits = 1024;
+ else
+ bits = DFAULT_KEYSIZE;
+ SetDlgItemInt (dlg, IDC_KEYGEN_SUBKEYBITS, bits, FALSE);
+ }
+
if (HIWORD (wparam) == BN_CLICKED &&
LOWORD (wparam) == IDC_KEYGEN_EXPNEVER) {
int never = IsDlgButtonChecked (dlg, IDC_KEYGEN_EXPNEVER);
@@ -445,7 +456,7 @@
if (!keygen_check_date (&st)) {
free_if_alloc (utf8_name);
free_if_alloc (utf8_comment);
- msg_box (dlg, _("The date you have chosen lies in the past."),
+ msg_box (dlg, _("The date you have chosen has already passed."),
_("Key Generation"), MB_ERR);
return TRUE;
}
Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeylist.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -594,7 +594,7 @@
{7, 72, (char *)_("Creation")},
{0, 0, NULL}
};
- HICON ico[2];
+ HICON ico[4];
listview_ctrl_t lv;
listview_column_t col;
int j, n = 0, ext_chk = 0;
Modified: trunk/Src/wptKeyserver.cpp
===================================================================
--- trunk/Src/wptKeyserver.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyserver.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -675,7 +675,7 @@
if (user && pass)
update_proxy_user (user, pass);
else if (user && !pass || !user && pass) {
- msg_box (NULL, _("Invalid proxy configuration."
+ msg_box (NULL, _("Invalid proxy configuration. "
"You need to set a user and a password "
"to use proxy authentication!"),
_("Proxy Error"), MB_ERR);
Modified: trunk/Src/wptKeyserverDlg.cpp
===================================================================
--- trunk/Src/wptKeyserverDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeyserverDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -579,7 +579,7 @@
SetDlgItemText (dlg, IDC_KEYSERVER_SEND,
_("Send key (default is receiving)"));
SetDlgItemText (dlg, IDC_KEYSERVER_INFO,
- _("Please enter the key ID or email address you search for"));
+ _("Key ID or email address you want to search for"));
SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));
SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange proxy"));
SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));
Modified: trunk/Src/wptKeysignDlg.cpp
===================================================================
--- trunk/Src/wptKeysignDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptKeysignDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -229,7 +229,7 @@
SetDlgItemText (dlg, IDC_SIGCLASS_CLASS2,
_("(2) I have done causal checking."));
SetDlgItemText (dlg, IDC_SIGCLASS_CLASS3,
- _("(3) I have done very careful checkings."));
+ _("(3) I have done very careful checking."));
CheckDlgButton (dlg, IDC_SIGCLASS_CLASS0, BST_CHECKED);
SetForegroundWindow (dlg);
center_window (dlg, parent? parent : NULL);
Modified: trunk/Src/wptMAPI.cpp
===================================================================
--- trunk/Src/wptMAPI.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptMAPI.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -137,7 +137,7 @@
if (rc == MAPI_E_USER_ABORT)
rc = SUCCESS_SUCCESS;
if (rc != SUCCESS_SUCCESS)
- MessageBox (NULL, _("Could not sent mail."), "MAPI", MB_ICONERROR|MB_OK);
+ MessageBox (NULL, _("Could not send mail."), "MAPI", MB_ICONERROR|MB_OK);
fail:
mapi_logoff (hd, 0, 0, 0);
Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptMainProc.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -40,6 +40,7 @@
#include "wptRegistry.h"
#include "wptKeyserver.h"
#include "wptAgent.h"
+#include "wptUTF8.h"
#include "wptKeyManager.h"
#include "wptCard.h"
#include "wptCryptdisk.h"
@@ -48,7 +49,10 @@
void update_keycache (HWND hwnd);
+/* Command for the Key Manager dialog. (0=no command) */
static int cmd = 0;
+
+/* 1 indicates that the clipboard will be emptied o exit. */
static int wipe_contents = 0;
@@ -58,6 +62,7 @@
{
gpg_keycache_t pc;
gpgme_key_t key;
+ char *uid;
char tmp[128+64+1];
switch (msg) {
@@ -65,10 +70,12 @@
pc = keycache_get_ctx (1);
while (!gpg_keycache_next_key (pc, 0, &key)) {
if (key->subkeys->pubkey_algo == GPGME_PK_ELG) {
+ uid = utf8_to_native (key->uids->uid);
_snprintf (tmp, sizeof (tmp)-1, "(0x%s) %s",
- key->subkeys->keyid+8, key->uids->uid);
+ key->subkeys->keyid+8, uid);
SendDlgItemMessage (dlg, IDC_ELGWARN_LIST, LB_ADDSTRING,
- 0, (LPARAM)(const char *) tmp);
+ 0, (LPARAM)(const char *)tmp);
+ free_if_alloc (uid);
}
}
gpg_keycache_rewind (pc);
@@ -111,14 +118,14 @@
wipe_contents = 1;
if (IsDlgButtonChecked (dlg, IDC_CONFDELCLIP_BRAIN))
set_reg_winpt_flag ("WipeClipboard", 1);
- EndDialog (dlg, TRUE);
+ EndDialog (dlg, 1);
break;
case IDNO:
wipe_contents = 0;
if (IsDlgButtonChecked (dlg, IDC_CONFDELCLIP_BRAIN))
set_reg_winpt_flag ("WipeClipboard", 0);
- EndDialog (dlg, FALSE);
+ EndDialog (dlg, 0);
break;
}
break;
@@ -141,9 +148,9 @@
break;
case ID_WINPT_CURRWND_ENCRYPT:
- dialog_box_param( glob_hinst, (LPCSTR)IDD_WINPT_ENCRYPT, hwnd,
+ dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_ENCRYPT, hwnd,
clip_encrypt_dlg_proc, 0,
- _("Encryption"), IDS_WINPT_ENCRYPT );
+ _("Encryption"), IDS_WINPT_ENCRYPT);
break;
case ID_WINPT_CURRWND_SIGNENCRYPT:
@@ -314,6 +321,24 @@
}
+/* Wipe the clipboard if the user requested it. */
+static void
+wipe_clipboard (int manual_shutdown)
+{
+ int has_data = 0;
+
+ if (!gpg_clip_istext_avail (&has_data) && has_data) {
+ int chk = get_reg_winpt_flag ("WipeClipboard");
+ if (chk == -1 && manual_shutdown)
+ DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_CONFDELCLIP,
+ GetDesktopWindow (), confirm_delclipboard_dlg, 0);
+ if (wipe_contents || chk)
+ set_clip_text (NULL, " ", 1);
+ wipe_contents = 0;
+ }
+}
+
+
/* Main message loop for the tray window. */
LRESULT CALLBACK
winpt_main_proc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
@@ -326,7 +351,8 @@
gpgme_error_t err;
curr_wnd_ctx currwnd = {0};
const char *s;
- int rc, set_wc = 0, has_data = 0;
+ int rc, set_wc = 0;
+ int has_data = 0;
switch (msg) {
case WM_CREATE:
@@ -358,24 +384,15 @@
wsock_end ();
keycache_release (1);
gnupg_backup_keyrings (reg_prefs.auto_backup,
- reg_prefs.backup.mode,
- reg_prefs.backup.include_secr);
+ reg_prefs.backup.mode,
+ reg_prefs.backup.include_secr);
free_reg_prefs ();
free_gnupg_table ();
hotkeys_unregister (hwnd);
PTD_delete ();
agent_flush_cache ();
html_help_deinit (cookie);
- if (!gpg_clip_istext_avail (&has_data) && has_data) {
- int chk = get_reg_winpt_flag ("WipeClipboard");
- if (chk == -1 && manual_shutdown)
- DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_CONFDELCLIP,
- GetDesktopWindow (), confirm_delclipboard_dlg,
- 0);
- if (wipe_contents || chk)
- set_clip_text (NULL, " ", 1);
- wipe_contents = 0;
- }
+ wipe_clipboard (manual_shutdown);
debug_end ();
Shell_NotifyIcon (NIM_DELETE, &NID);
PostQuitMessage (0);
@@ -388,20 +405,19 @@
HMENU hm, popup;
POINT p;
- gpg_read_only = gpg_check_permissions (0) == 0? 0 : 1;
-
if (!wait_for_progress_cb (0))
break;
+ gpg_read_only = gpg_check_permissions (0) == 0? 0 : 1;
SetForegroundWindow (hwnd);
GetCursorPos (&p);
hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT));
popup = GetSubMenu (hm, 0);
+ if (!scard_support)
+ set_menu_state (popup, ID_WINPT_CARD, MF_DISABLED|MF_GRAYED);
set_menu_text (popup, ID_WINPT_FILE, _("File Manager"));
set_menu_text (popup, ID_WINPT_KEY, _("Key Manager"));
set_menu_text (popup, ID_WINPT_CARD, _("Card Manager"));
- if (!scard_support)
- set_menu_state (popup, ID_WINPT_CARD, MF_DISABLED|MF_GRAYED);
set_menu_text (popup, ID_WINPT_EDIT, _("Edit"));
set_menu_text (popup, ID_WINPT_ABOUT, _("About..."));
set_menu_text (popup, ID_WINPT_QUIT, _("Exit"));
@@ -482,22 +498,22 @@
break;
case WPT_AGENT_FORGET_ID:
- rc = msg_box( hwnd, _("Remove all passphrases from cache?"),
- _("WinPT"), MB_YESNO|MB_ICONQUESTION );
- if( rc == IDYES )
- agent_flush_cache();
+ rc = msg_box (hwnd, _("Remove all passphrases from cache?"),
+ _("WinPT"), MB_YESNO|MB_ICONQUESTION);
+ if (rc == IDYES)
+ agent_flush_cache ();
break;
}
break;
case WM_COMMAND:
- if( gnupg_access_keyring( 1 ) ) {
- if( log_box( "WinPT", MB_ERR|MB_YESNO,
- _("Could not access public keyring, exit WinPT?") ) == IDYES )
- SendMessage( hwnd, WM_DESTROY, 0, 0 );
+ if (gnupg_access_keyring (1)) {
+ if (log_box( "WinPT", MB_ERR|MB_YESNO,
+ _("Could not access public keyring, exit WinPT?") ) == IDYES)
+ SendMessage (hwnd, WM_DESTROY, 0, 0);
break;
}
- switch( wparam ) {
+ switch (wparam) {
/** Clipboard operations **/
case ID_WINPT_SYMENC:
case ID_WINPT_ENCRYPT:
@@ -523,12 +539,12 @@
case ID_WINPT_CURRWND_SIGNENCRYPT:
case ID_WINPT_CURRWND_DECRYPT_VERIFY:
case ID_WINPT_CURRWND_SIGN:
- rc = get_window_contents( hwnd, &currwnd, &use_hotkey );
- if( rc ) {
- log_box( _("WinPT Error"), MB_ERR,
+ rc = get_window_contents (hwnd, &currwnd, &use_hotkey);
+ if (rc) {
+ log_box (_("WinPT Error"), MB_ERR,
_("Make sure that the window contains text.\n"
"%s."),
- winpt_strerror( WPTERR_CURR_WND ) );
+ winpt_strerror (WPTERR_CURR_WND));
break;
}
rc = currwnd_gpg_dlg (hwnd, (UINT)wparam, &set_wc);
Modified: trunk/Src/wptPassphraseDlg.cpp
===================================================================
--- trunk/Src/wptPassphraseDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptPassphraseDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -143,7 +143,7 @@
else if (pwd->strict && check_passwd_quality (pwd->pwd, 0)) {
int id = msg_box (dlg, _("Your passphrase should be at least 8 characters"
" long\nand should contain non-alphabetic characters."
- "\n\nStill proceed?"),
+ "\n\nContinue?"),
_("Key Generation"), MB_ICONWARNING|MB_YESNO);
if (id == IDNO)
return TRUE;
@@ -153,7 +153,7 @@
cancel = msg_box (dlg,
_("The passphrase contains 8-bit characters.\n"
"It is not suggested to use charset specific characters.\n"
- "Still proceed?"),
+ "Continue?"),
_("Key Generation"), MB_ICONWARNING|MB_YESNO);
if (cancel == IDNO) {
wipememory (pwd->pwd, sizeof (pwd->pwd));
Modified: trunk/Src/wptPreferencesDlg.cpp
===================================================================
--- trunk/Src/wptPreferencesDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptPreferencesDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -220,7 +220,7 @@
if (reg_prefs.always_trust) {
msg_box (dlg,
_("In most cases it is not a good idea to enable this setting.\n"
- "If you know what you are doing let this flag enabled, otherwise\n"
+ "If you know what you are doing, you can enable this flag, otherwise\n"
"it is safe to leave this flag untouched."),
_("Preferences"), MB_ICONWARNING|MB_OK);
}
Modified: trunk/Src/wptSigTreeDlg.cpp
===================================================================
--- trunk/Src/wptSigTreeDlg.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptSigTreeDlg.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -162,7 +162,7 @@
sigtree_load (tree, key);
_snprintf (inf, sizeof (inf)-1,
_("Signature Tree for \"%s\" (0x%s)"),
- key->ext->uids->uid, key->ctx->subkeys->keyid+8);
+ key->ext->uids->name, key->ctx->subkeys->keyid+8);
SetDlgItemText (dlg, IDC_VKEYSIG_EDIT, _("Edit..."));
SetWindowText (dlg, inf);
SetForegroundWindow (dlg);
Modified: trunk/Src/wptW32API.cpp
===================================================================
--- trunk/Src/wptW32API.cpp 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/Src/wptW32API.cpp 2006-07-28 11:11:09 UTC (rev 248)
@@ -503,7 +503,7 @@
get_file_version (const char *fname, WORD *major, WORD *minor,
WORD *patch1, WORD *patch2)
{
- VS_FIXEDFILEINFO *inf = {0};
+ VS_FIXEDFILEINFO *inf;
char file[MAX_PATH+1] = {0};
LPVOID buf, data;
DWORD arg;
@@ -514,7 +514,7 @@
size = GetFileVersionInfoSize (file, &arg);
if (!size)
return -1;
- buf = (LPVOID)new CHAR[size];
+ buf = (LPVOID)new char[size];
if (!buf)
BUG (NULL);
GetFileVersionInfo (file, 0, size, buf);
@@ -522,7 +522,7 @@
qlen=0;
VerQueryValue (buf, "\\", &data, &qlen);
if (!qlen) {
- delete [] (char*)buf;
+ delete [](char*)buf;
return -1;
}
inf = (VS_FIXEDFILEINFO*)data;
@@ -536,7 +536,7 @@
if (patch2)
*patch2 = LOWORD (inf->dwProductVersionLS);
- delete [] (char*)buf;
+ delete [](char*)buf;
return 0;
}
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/THANKS 2006-07-28 11:11:09 UTC (rev 248)
@@ -24,6 +24,7 @@
Andreas Fehr andreas at mrs.ch
Andreas Jobs andreas.jobs at ruhr-uni-bochum.de
Andres Lessing
+Anthony Bryan
Alexander Hanf
Bill Harris
Bob Caplan rsc22 at cornell.edu
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2006-07-21 08:19:24 UTC (rev 247)
+++ trunk/TODO 2006-07-28 11:11:09 UTC (rev 248)
@@ -3,8 +3,6 @@
MUST items before we can release 1.0.0
=======================================
-# implement models for all important list views to allow
- sorting and similar actions.
# check all dialog for consistent handling
More information about the Winpt-commits
mailing list