[Gpa-commits] r754 - in trunk: . po

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-03-21 19:50:39 +0100 (Tue, 21 Mar 2006)
New Revision: 754

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/po/ChangeLog
   trunk/po/Makevars
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_TW.Big5.po
Log:
preparing a new release


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/ChangeLog	2006-03-21 18:50:39 UTC (rev 754)
@@ -1,3 +1,7 @@
+2006-03-21  Werner Koch  <wk at g10code.com>
+
+	Released 0.7.3.
+
 2006-03-09  Werner Koch  <wk at g10code.com>
 
 	* config.guess, config.sub:  Updated.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/NEWS	2006-03-21 18:50:39 UTC (rev 754)
@@ -1,7 +1,9 @@
-Noteworthy changes in version 0.7.3 (unreleased)
+Noteworthy changes in version 0.7.3 (2006-03-21)
 ------------------------------------------------
 
+ * Minor fixes.
 
+
 Noteworthy changes in version 0.7.2 (2006-03-03)
 ------------------------------------------------
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/configure.ac	2006-03-21 18:50:39 UTC (rev 754)
@@ -1,7 +1,26 @@
-dnl
-dnl Configure script source for GPA
-dnl
-dnl (Process this file with autoconf to produce a configure script.)
+# configure.ac for GPA
+# Copyright (C) 2000, 2001  Werner Koch
+# Copyright (C) 2002, 2003, 2004  Miguel Coca
+# Copyright (C) 2005, 2006  g10 Code GmbH
+# 
+# This file is part of GPA.
+# 
+# GPA 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.
+# 
+# GPA is distributed in the hope that it will be useful,g
+# 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 this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+# MA 02110-1301, USA
+# 
+# (Process this file with autoconf to produce a configure script.)
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
 
@@ -18,9 +37,8 @@
 # the configure script, so that a proper revision number for all files
 # is available when running a "make distcheck".
 m4_define(my_version, [0.7.3])
-m4_define(my_iscvs, yes)
+#m4_define(my_iscvs, yes)
 
-
 AC_INIT([gpa], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit(
                [$Revision$],[Ra-z $:])]),
                [bug-gpa at gnupg.org])

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/ChangeLog	2006-03-21 18:50:39 UTC (rev 754)
@@ -1,3 +1,7 @@
+2006-03-21  Werner Koch  <wk at g10code.com>
+
+	* Makevars: Set bug report address and set copyright string to PD.
+
 2006-02-23  Marcus Brinkmann  <marcus at g10code.de>
 
 	* de.po: Remove dangling '_' in toolbox item name.

Modified: trunk/po/Makevars
===================================================================
--- trunk/po/Makevars	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/Makevars	2006-03-21 18:50:39 UTC (rev 754)
@@ -18,7 +18,7 @@
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+COPYRIGHT_HOLDER = 
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
@@ -34,7 +34,7 @@
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = gpa-dev at gnupg.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/de.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2006-01-13 09:37+0100\n"
 "Last-Translator: Steffen Michalek <steffen at michalek.de>\n"
 "Language-Team: deutsch <de at li.org>\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Abbrechen"
@@ -270,7 +270,7 @@
 msgid "a_rmor"
 msgstr "ASCII-_Verpackung"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -280,14 +280,14 @@
 "Möchten Sie sie überschreiben?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Ja"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -616,16 +616,16 @@
 msgid "Can authenticate"
 msgstr "Zum Autentifizieren verwendbar"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Widerrufen"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -633,11 +633,11 @@
 msgid "Unsigned"
 msgstr "Nicht beglaubigt"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Gültig"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Benutzerkennung:"
@@ -646,7 +646,7 @@
 msgid "User Names:"
 msgstr "Benutzernamen:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "Schlüsselkennung:"
@@ -687,7 +687,7 @@
 msgid "_Apply"
 msgstr "_Anwenden"
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -704,7 +704,7 @@
 "\n"
 "Die Anwendung wird abgebrochen."
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -723,7 +723,7 @@
 "Dies ist wahrscheinlich ein Fehler in GPA.\n"
 "GPA versucht nun, sich davon wieder zu erholen."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -738,7 +738,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -746,111 +746,111 @@
 "Der in dieser Datei gesicherte Schlüssel ist:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA und ElGamal (Voreinstellung)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (nur signieren)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (nur signieren)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "unbekannt"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "niemals"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "geringfügig"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "vollständig"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Ultimativ"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "unvollständig"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "voll gültig"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Bitte geben Sie den Passwortsatz für den folgenden Schlüssel ein:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Falscher Passwortsatz, bitte versuchen Sie es erneut:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Passwortsatz eingeben"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr "[Keine]"
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Unbekannte Benutzerkennung]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Ungültig"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "Generisch"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Beiläufig"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "Positiv"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung, zum Signieren und zur Verschlüsselung "
 "verwendet werden."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung und zum Signieren verwendet werden, "
 "nicht aber zur Verschlüsselung."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr ""
 "Der Schlüssel kann zur Zertifizierung und zur Verschlüsselung verwendet "
 "werden."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "Der Schlüssel ist ausschließlich zum Zertifizieren verwendbar."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -858,15 +858,15 @@
 "Der Schlüssel ist nur zum Signieren und Verschlüsseln verwendbar, nicht aber "
 "zum Zertifizieren."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "Der Schlüssel ist ausschließlich zum Signieren verwendbar."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "Der Schlüssel ist ausschließlich zum Verschlüsseln verwendbar."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "Dieser Schlüssel ist nicht verwendbar."
 
@@ -988,7 +988,7 @@
 msgid "Change _expiration"
 msgstr "_Verfallsdatum ändern"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -997,7 +997,7 @@
 "\"Passwortsatz\" und \"Passwortsatz wiederholen\"\n"
 "genau den selben Passwortsatz eingeben."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1006,7 +1006,7 @@
 "Dieser wird aber benötigt, um Ihren geheimen\n"
 "Schlüssel vor unbefugtem Zugriff zu schützen."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1018,15 +1018,15 @@
 "\n"
 "Bitte geben Sie einen neuen Passwortsatz ein."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Neuen Passwortsatz eingeben"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Diesen _trotzdem verwenden"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Schlüssel erzeugen"
 
@@ -1070,7 +1070,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Passwortsatz wiederholen: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1081,15 +1081,15 @@
 "\n"
 "Ihre Korrespondenzpartner können Ihren Schlüssel anhand Ihres Namens finden."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Ihr Name:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Bitte geben Sie Ihren Namen an."
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1103,43 +1103,27 @@
 "Korrespondenzpartner daher, Ihren Schlüssel zu identifizieren.\n"
 "Falls Sie mehrere E-Mail-Adressen haben, können Sie diese später hinzufügen."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Ihre E-Mail-Adresse:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Bitte geben Sie Ihre E-Mail-Adresse an"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Wenn Sie möchten, können Sie einen Kommentar hinzufügen, der den Schlüssel "
-"genauer beschreibt. Ein Kommentar ist vor allem dann sinnvoll, wenn Sie "
-"mehrere Schlüssel für die gleiche E-Mail-Adresse erstellen. Wenn Sie keine "
-"Verwendung dafür haben, können Sie den Kommentar auch einfach leer lassen."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Bemerkung:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Bitte geben Sie den Passwortsatz für Ihren neuen Schlüssel an:"
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Passwortsatz: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Passwortsatz wiederholen: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1151,15 +1135,15 @@
 "Sicherung auf einer Diskette (Laufwerk A:\\).\n"
 "Möchten Sie eine Sicherheitskopie anlegen?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "_Sicherheitskopie anlegen"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Später _erledigen"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1169,7 +1153,7 @@
 "\n"
 "Dies kann auch auf schnellen Computern etwas dauern. Bitte haben Sie Geduld."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1830,6 +1814,21 @@
 msgid "Signatures:"
 msgstr "Signaturen (Beglaubigungen)"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Wenn Sie möchten, können Sie einen Kommentar hinzufügen, der den "
+#~ "Schlüssel genauer beschreibt. Ein Kommentar ist vor allem dann sinnvoll, "
+#~ "wenn Sie mehrere Schlüssel für die gleiche E-Mail-Adresse erstellen. Wenn "
+#~ "Sie keine Verwendung dafür haben, können Sie den Kommentar auch einfach "
+#~ "leer lassen."
+
+#~ msgid "Comment:"
+#~ msgstr "Bemerkung:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "signieren, _nicht komprimieren"
 

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/es.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-10-18 13:35+0200\n"
 "Last-Translator: Miguel Coca <mcoca at gnu.org>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -270,7 +270,7 @@
 msgid "a_rmor"
 msgstr "a_rmadura"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -280,14 +280,14 @@
 "¿Quiere sobreescribirlo?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Sí"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -613,16 +613,16 @@
 msgid "Can authenticate"
 msgstr "Puede autenticar"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Revocada"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Caducada"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Desactivada"
 
@@ -630,11 +630,11 @@
 msgid "Unsigned"
 msgstr "Sin firmar"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Válida"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Nombre de Usuario:"
@@ -643,7 +643,7 @@
 msgid "User Names:"
 msgstr "Nombres de Usuario:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "ID de Clave:"
@@ -685,7 +685,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -702,7 +702,7 @@
 "\n"
 "Se abortará la aplicación"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -721,7 +721,7 @@
 "Esto probablemente se deba a un fallo en GPA.\n"
 "GPA intentará recuperarse de este error."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -735,7 +735,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -743,106 +743,106 @@
 "La clave contenida en este archivo es:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA y ElGamal (por defecto)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (solo firma)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (solo firma)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Nunca"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Parcial"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Total"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Absoluta"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Incompleta"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Totalmente Válida"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Por favor introduzca la contraseña para la siguiente clave:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Contraseña incorrecta, por favor vuelva a intentarlo:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Introduzca Contraseña"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Usuario desconocido]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Incorrecta"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "Genérica"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Casual"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "Positiva"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Esta clave puede utilizarse para certificación, firma y cifrado."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Esta clave puede utilizarse para certificación y firma, pero no para cifrado."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "Esta clave puede utilizarse para certificación y cifrado."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "Esta clave puede utilizarse solo para certificación."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -850,15 +850,15 @@
 "Esta clave puede utilizarse solo para firma y cifrado, pero no para\n"
 "certificación."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "Esta clave puede utilizarse tan solo para firma."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "Esta clave puede utilizarse tan solo para cifrado."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "Esta clave no vale para nada."
 
@@ -980,7 +980,7 @@
 msgid "Change _expiration"
 msgstr "Cambiar ca_ducidad"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -988,7 +988,7 @@
 "En \"Contraseña\" y \"Repetir contraseña\",\n"
 "debe introducir la misma contraseña."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -996,7 +996,7 @@
 "No introdujo ninguna contraseña.\n"
 "Es necesaria para proteger su clave secreta."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1008,15 +1008,15 @@
 "\n"
 "Por favor introduzca una nueva contraseña."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Introducir nueva contraseña"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "_Usar esta de todas formas"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Generar clave"
 
@@ -1060,7 +1060,7 @@
 msgid "_Repeat passphrase: "
 msgstr "Re_petir contraseña: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1072,15 +1072,15 @@
 "Su nombre será parte de la nueva clave, para facilitar a otras personas "
 "identificar claves."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Su Nombre:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Por favor, introduzca su nombre"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1094,43 +1094,27 @@
 "identificar claves. Si tiene varias direcciones, puede añadir otras más "
 "tarde."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Su dirección de correo electrónico"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Por favor introduzca su dirección de correo electrónico"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Si lo desea, puede proporcioar un comentario que identifique la clave a "
-"otros usuarios. El comentario es especialmente útil si genera varias claves "
-"para la misma dirección de correo. Este comentario es completamente "
-"opcional, y puede dejarlo en blanco si no lo necesita."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Por favor, escoja una contraseña para la nueva clave."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Contraseña: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Repetir contraseña: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1142,15 +1126,15 @@
 "\n"
 "¿Quiere crear una copia de seguridad ahora?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Crear copia de _seguridad"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Hacerlo más _tarde"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1161,7 +1145,7 @@
 "Incluso en un ordenador rápido esto podría llevar tiempo. Por favor, sea "
 "paciente."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1811,6 +1795,20 @@
 msgid "Signatures:"
 msgstr "Firmas:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Si lo desea, puede proporcioar un comentario que identifique la clave a "
+#~ "otros usuarios. El comentario es especialmente útil si genera varias "
+#~ "claves para la misma dirección de correo. Este comentario es "
+#~ "completamente opcional, y puede dejarlo en blanco si no lo necesita."
+
+#~ msgid "Comment:"
+#~ msgstr "Comentario:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "firmar sin _comprimir"
 

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/fr.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-01-01 21:11+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <fr at li.org>\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -285,7 +285,7 @@
 msgid "a_rmor"
 msgstr "a_rmure"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -295,7 +295,7 @@
 "Voulez-vous l'écraser?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 #, fuzzy
@@ -303,7 +303,7 @@
 msgstr "/_Clefs"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -650,18 +650,18 @@
 msgid "Can authenticate"
 msgstr ""
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 #, fuzzy
 msgid "Revoked"
 msgstr "Retirer"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 #, fuzzy
 msgid "Expired"
 msgstr "_expire le"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 #, fuzzy
 msgid "Disabled"
 msgstr "détaillé"
@@ -671,12 +671,12 @@
 msgid "Unsigned"
 msgstr "signé"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 #, fuzzy
 msgid "Valid"
 msgstr "valide"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Nom d'utilisateur:"
@@ -686,7 +686,7 @@
 msgid "User Names:"
 msgstr "Nom d'utilisateur:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "ID de clef:"
@@ -729,7 +729,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -746,7 +746,7 @@
 "\n"
 "L'application va se terminer"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -758,7 +758,7 @@
 "GPA will now try to recover from this error."
 msgstr ""
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -772,7 +772,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -780,128 +780,128 @@
 "La clef sauvegardée dans ce fichier est:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 #, fuzzy
 msgid "DSA and ElGamal (default)"
 msgstr "DSA et ElGamal"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (signature seulement)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 #, fuzzy
 msgid "RSA (sign only)"
 msgstr "DSA (signature seulement)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 #, fuzzy
 msgid "Unknown"
 msgstr "inconnu"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Jamais"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Marginale"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Complète"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Ultime"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Incomplet"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Complètement valide"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 #, fuzzy
 msgid "Please enter the passphrase for the following key:"
 msgstr "Veuillez entrer le mot de passe pour la clef suivante:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Mauvaise mot de passe, essayez encore:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 #, fuzzy
 msgid "Enter Passphrase"
 msgstr "Entrer mot de passe"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[ID d'utilisateur inconnue]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Mauvais"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr ""
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr ""
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr ""
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr ""
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 #, fuzzy
 msgid "The key can be used for certification and encryption."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 #, fuzzy
 msgid "The key can be used only for certification."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 #, fuzzy
 msgid "The key can be used only for signing."
 msgstr "Aucune clef sélectionnée pour signer."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 #, fuzzy
 msgid "The key can be used only for encryption."
 msgstr "Aucun fichier sélectionné pour le chiffrement"
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr ""
 
@@ -1029,7 +1029,7 @@
 msgid "Change _expiration"
 msgstr "Changer _expiration"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 #, fuzzy
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
@@ -1038,7 +1038,7 @@
 "Dans \"Mot de passe\" et \"Répéter le mot de passe\",\n"
 "vous devez entrer le même mot de passe."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1046,7 +1046,7 @@
 "Vous n'avez pas entré de mot de passe.\n"
 "C'est nécessaire pour protéger votre clef privée."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1058,15 +1058,15 @@
 "\n"
 "Veuilez entrer un nouveau mot de passe."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Entrer le nouveau mot de passe"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Prendre celui là _quand même"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Générer clef"
 
@@ -1115,7 +1115,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Répéter le mot de passe:"
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1127,15 +1127,15 @@
 "Votre nom fera partie de la nouvelle clef pour permettre aux autres "
 "d'identifier plus facilement les clefs."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Votre nom:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Veuillez indiquer votre nom"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 #, fuzzy
 msgid ""
 "Please insert your email address.\n"
@@ -1150,47 +1150,30 @@
 "autres d'identifier plus facilement les clefs. Si vous avez plusieurs "
 "adresses e-mail, vous pourrez ajouter d'autres adresses e-mail plus tard."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 #, fuzzy
 msgid "Your Email Address:"
 msgstr "Votre adresse e-mail:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Veuillez indiquer votre adresse e-mail"
 
-#: src/keygenwizard.c:221
-#, fuzzy
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Si vous voulez, vous pouvez ajouter un commentaire qui identifie la clef "
-"pour les autres utilisateurs. Le commentaire est particulièrement utile si "
-"vous générez plusieurs clefs pour la même adresse e-mail. Le commentaire est "
-"complètement optionnel. Laissez-le vide si vous n'en avez pas l'utilité."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Commentaire:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Veuillez choisir un mot de passe pour cette nouvelle clef."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 #, fuzzy
 msgid "Passphrase: "
 msgstr "M_ot de passe"
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 #, fuzzy
 msgid "Repeat Passphrase: "
 msgstr "Répéter le mo_t de passe: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1202,15 +1185,15 @@
 "\n"
 "Voulez-vous créer une copie de sauvegarde?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Créer une _copie de sauvegarde"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Le faire plus _tard"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 #, fuzzy
 msgid ""
 "Your key is being generated.\n"
@@ -1222,7 +1205,7 @@
 "Même sur des oridnateurs rapides, cela peut prendre un moment. Merci de "
 "patienter\n"
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1927,6 +1910,22 @@
 msgid "Signatures:"
 msgstr "Signatures"
 
+#, fuzzy
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Si vous voulez, vous pouvez ajouter un commentaire qui identifie la clef "
+#~ "pour les autres utilisateurs. Le commentaire est particulièrement utile "
+#~ "si vous générez plusieurs clefs pour la même adresse e-mail. Le "
+#~ "commentaire est complètement optionnel. Laissez-le vide si vous n'en avez "
+#~ "pas l'utilité."
+
+#~ msgid "Comment:"
+#~ msgstr "Commentaire:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "signer, ne pas compresser"
 

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/ja.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.6.1-cvs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-11-03 17:11+0100\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
 "Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë (_C)"
@@ -270,7 +270,7 @@
 msgid "a_rmor"
 msgstr "¥¢¡¼¥Þ·ÁÀ® (_R)"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -280,14 +280,14 @@
 "¾å½ñ¤­¤·¤Þ¤¹¤«?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "¤Ï¤¤ (_Y)"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -611,16 +611,16 @@
 msgid "Can authenticate"
 msgstr "ǧ¾Ú²Äǽ"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "ÇË´þºÑ¤ß"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "´ü¸ÂÀÚ¤ì"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "̵¸ú"
 
@@ -628,11 +628,11 @@
 msgid "Unsigned"
 msgstr "½ð̾¤Ê¤·"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Í­¸ú"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "¥æ¡¼¥¶Ì¾:"
@@ -641,7 +641,7 @@
 msgid "User Names:"
 msgstr "¥æ¡¼¥¶Ì¾:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "¸° ID:"
@@ -683,7 +683,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -700,7 +700,7 @@
 "\n"
 "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï½ªÎ»¤·¤Þ¤¹"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -719,7 +719,7 @@
 "¤³¤ì¤Ï¤ª¤½¤é¤¯ GPA ¤Î¥Ð¥°¤Ç¤¹¡£\n"
 "¤¿¤À¤¤¤Þ¥¨¥é¡¼¤«¤é¤ÎÉüµì¤ò»î¤ß¤Þ¤¹¡£"
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -733,7 +733,7 @@
 "**********************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -741,119 +741,119 @@
 "¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤µ¤ì¤Æ¤¤¤ë¸°¤Ï:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ¤È ElGamel (¥Ç¥Õ¥©¥ë¥È)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (½ð̾¤Î¤ß)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (½ð̾¤Î¤ß)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "̤³Îǧ"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "ÉÔ¿®"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "°ìÉô"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "´°Á´"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "µæ¶Ë"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "ÉÔ´°Á´"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "´°Á´¤ËÍ­¸ú"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "°Ê²¼¤Î¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°ã¤¤¤Þ¤¹¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[̤³Îǧ¥æ¡¼¥¶ ID]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "ÉÔÀµ"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "°ìÈÌ"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "¸Ä¿Í"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "¥«¥¸¥å¥¢¥ë"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "¥Ý¥¸¥Æ¥£¥ô"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr "¾ÚÌÀ¡¢½ð̾¡¢°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "¾ÚÌÀ¤ª¤è¤Ó½ð̾¤Ë»È¤¨¤Þ¤¹¤¬¡¢°Å¹æ²½¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "¾ÚÌÀ¤È°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "¾ÚÌÀ¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "½ð̾¤ª¤è¤Ó°Å¹æ²½¤Ë»È¤¨¤Þ¤¹¤¬¡¢¾ÚÌÀ¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "½ð̾¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "°Å¹æ²½¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "¤³¤Î¸°¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
@@ -974,7 +974,7 @@
 msgid "Change _expiration"
 msgstr "Í­¸ú´ü¸Â¤òÊѹ¹ (_E)"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -982,7 +982,7 @@
 "\"¥Ñ¥¹¥ï¡¼¥É\" ¤È \"ºÆÆþÎÏ\" ¤Ë¤Ï\n"
 "Ʊ¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -990,7 +990,7 @@
 "¥Ñ¥¹¥ï¡¼¥É¤¬ÆþÎϤµ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "ÈëÌ©¸°¤ò¼é¤ë¤¿¤á¤ËɬÍפǤ¹¡£"
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1002,15 +1002,15 @@
 "\n"
 "¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ (_E)"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "¤È¤Ë¤«¤¯¤³¤ì¤Ë¤¹¤ë (_A)"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "¸°¤òÀ¸À®"
 
@@ -1054,7 +1054,7 @@
 msgid "_Repeat passphrase: "
 msgstr "ºÆÆþÎÏ (_R): "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1065,15 +1065,15 @@
 "\n"
 "¾¤Î¿Í¤¬¸°¤òÍưפ˼±Ê̤Ǥ­¤ë¤è¤¦¤Ë¡¢Ì¾Á°¤ò¿·¤·¤¤¸°¤Î°ìÉô¤Ë¤·¤Þ¤¹"
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "»á̾:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "»á̾¤òµ­Æþ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1086,43 +1086,27 @@
 "¾¤Î¿Í¤¬¸°¤ò´Êñ¤Ë¼±Ê̤Ǥ­¤ë¤è¤¦¤Ë¡¢E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¿·¤·¤¤¸°¤Î°ìÉô¤Ë¤·¤Þ"
 "¤¹¡£E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÊ£¿ô»ý¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢»Ä¤ê¤Ï¸å¤ÇÄɲäǤ­¤Þ¤¹¡£"
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "E ¥á¡¼¥ë¥¢¥É¥ì¥¹:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤òµ­Æþ¤·¤Æ²¼¤µ¤¤"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"¤ªË¾¤ß¤Ê¤é¡¢¸°¤ò¤µ¤é¤ËÆÃħ¤Å¤±¤ë¥³¥á¥ó¥È¤ò¾¤Î¥æ¡¼¥¶¤Î¤¿¤á¤ËÄ󶡤¹¤ë¤³¤È¤¬¤Ç"
-"¤­¤Þ¤¹¡£Æ±¤¸ E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ë¸°¤òÊ£¿ôÀ¸À®¤¹¤ë¾ì¹ç¤Ï¡¢Æä˥³¥á¥ó¥È¤¬Ìò¤ËΩ¤Á"
-"¤Þ¤¹¡£¥³¥á¥ó¥È¤ÏÉÕ¤±¤Æ¤âÉÕ¤±¤Ê¤¯¤Æ¤â¤Þ¤Ã¤¿¤¯¹½¤¤¤Þ¤»¤ó¡£ÉÔÍפʤé¶õ¤Ë¤·¤Æ¤ª¤¤"
-"¤Æ¤¯¤À¤µ¤¤¡£"
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "¥³¥á¥ó¥È:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "¿·¤·¤¤¸°¤Î¤¿¤á¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ²¼¤µ¤¤¡£"
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "ºÆÆþÎÏ: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1132,15 +1116,15 @@
 "¿·¤·¤¤¸°¤¬½ÐÍè¾å¤¬¤Ã¤¿¤é¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¥³¥Ô¡¼¤òºîÀ®¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£\n"
 "¥Ð¥Ã¥¯¥¢¥Ã¥×¥³¥Ô¡¼¤òºî¤ê¤Þ¤¹¤«¡©"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¤ÎºîÀ® (_B)"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "¸å¤Ç (_L)"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1150,7 +1134,7 @@
 "\n"
 "¹â®¤Ê¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤â¤·¤Ð¤é¤¯¤«¤«¤ê¤Þ¤¹¡£²æËý¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1793,6 +1777,20 @@
 msgid "Signatures:"
 msgstr "½ð̾:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "¤ªË¾¤ß¤Ê¤é¡¢¸°¤ò¤µ¤é¤ËÆÃħ¤Å¤±¤ë¥³¥á¥ó¥È¤ò¾¤Î¥æ¡¼¥¶¤Î¤¿¤á¤ËÄ󶡤¹¤ë¤³¤È¤¬"
+#~ "¤Ç¤­¤Þ¤¹¡£Æ±¤¸ E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ë¸°¤òÊ£¿ôÀ¸À®¤¹¤ë¾ì¹ç¤Ï¡¢Æä˥³¥á¥ó¥È¤¬Ìò"
+#~ "¤ËΩ¤Á¤Þ¤¹¡£¥³¥á¥ó¥È¤ÏÉÕ¤±¤Æ¤âÉÕ¤±¤Ê¤¯¤Æ¤â¤Þ¤Ã¤¿¤¯¹½¤¤¤Þ¤»¤ó¡£ÉÔÍפʤé¶õ¤Ë"
+#~ "¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid "Comment:"
+#~ msgstr "¥³¥á¥ó¥È:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "°µ½Ì¤Ê¤·¤Ç½ð̾¤¹¤ë (_N)"
 

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/nl.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.5.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-10-19 14:29+0200\n"
 "Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
 "Language-Team: DUTCH <nl at li.org>\n"
@@ -14,7 +14,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Annuleer"
@@ -267,7 +267,7 @@
 msgid "a_rmor"
 msgstr "a_rmor"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -277,14 +277,14 @@
 "Wilt u het bestand overschrijven?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Ja"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -610,16 +610,16 @@
 msgid "Can authenticate"
 msgstr "Kan geauthenticeerd worden"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Terugtrekken"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Vervallen"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
@@ -627,11 +627,11 @@
 msgid "Unsigned"
 msgstr "Niet ondertekend"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Geldig"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Gebruiker naam:"
@@ -640,7 +640,7 @@
 msgid "User Names:"
 msgstr "Gebruikers Namen:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "Sleutel ID:"
@@ -682,7 +682,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -699,7 +699,7 @@
 "\n"
 "De toepassing zal worden afgesloten"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -718,7 +718,7 @@
 "Dit is waarschijnlijk een fout in GPA.\n"
 "GPA zal nu proberen te herstellen van deze fout."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -731,7 +731,7 @@
 "* Bewaar dit bestand aub in een veilige plaats.                        *\n"
 "************************************************************************\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -739,109 +739,109 @@
 "De sleutel is gebackuped in dit bestand:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA en ElGamal (standaard)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (alleen ondertekenen)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "DSA (alleen ondertekenen)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Nooit"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Marginaal"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Volledig"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Ultiem"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Niet compleet"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Volledig geldig"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Geef aub het wachwoord in voor de volgende sleutel:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Verkeerd wachtwoord, probeer aub opnieuw:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Wachtwoord ingeven"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Onbekende gebruiker ID]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Slecht"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "Algemeen"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "Persoonlijk"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Gewoon"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "Positief"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie, onderteken en "
 "versleuteling."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie en ondertekenen, maar niet "
 "voor versleuteling."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "De sleutel kan gebruikt worden voor certificatie en versleuteling."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -849,15 +849,15 @@
 "De sleutel kan enkel gebruikt worden voor ondertekenen en encryptie, maar "
 "niet voor certificatie."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "De sleutel kan alleen gebruikt worden voor ondertekenen."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "Deze sleutel is waardeloos."
 
@@ -979,7 +979,7 @@
 msgid "Change _expiration"
 msgstr "_Verander verval datum"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -987,7 +987,7 @@
 "in \"Wachtwoord\" en \"Herhaal wachtwoord\",\n"
 "moet u hetzelfde wachtwoord herhalen."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -995,7 +995,7 @@
 "U gaf geen wachtwoord in.\n"
 "Het is nodig om uw geheime sleutel te beschermen."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1007,15 +1007,15 @@
 "\n"
 "Geef aub een nieuw wachtwoord in."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Geef een nieuw wachtwoord in"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Neem deze _weg"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Genereer sleutel"
 
@@ -1059,7 +1059,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Herhaal wachtwoord: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1071,15 +1071,15 @@
 "Uw naam zal deel uitmaken van de nieuwe sleutel en maak het eenvoudiger.voor "
 "anderen om sleutels te identificieren."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Uw naam:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Geef aub uw  naam in"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1093,44 +1093,27 @@
 "eenvoudigerom sleutels te identificieren. Als u meerdere E-mail adressen "
 "heeft, kan u later nog altijd E-mail adressen toevoegen."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Uw E-Mail adress:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Geef aub uw E-mail adress in:"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Als u wil kan u een commentaar toevoegen dat de sleutel verder "
-"identificieert naar andere gebruikers toe. Het commentaar is zeker nuttig "
-"als u verschillende sleutels genereert voor hetzelfde E-mail adress. Het "
-"commentaar is volledig optioneel.Laat dit leeg als u geen commentaar wilt "
-"toevoegen."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Commentaar:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Kies aub een wachtwoord voor de nieuwe sleutel."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Wachtwoord: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Herhaal wachtwoord: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1141,15 +1124,15 @@
 "gemaakt is.\n"
 "Wilt u een reserve kopie maken?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Maak _backup kopie"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Doe het _later"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1159,7 +1142,7 @@
 "\n"
 "Zelfs op snelle computers kan dit even duren. Wees aub geduldig."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1808,6 +1791,21 @@
 msgid "Signatures:"
 msgstr "Ondertekeningen:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Als u wil kan u een commentaar toevoegen dat de sleutel verder "
+#~ "identificieert naar andere gebruikers toe. Het commentaar is zeker nuttig "
+#~ "als u verschillende sleutels genereert voor hetzelfde E-mail adress. Het "
+#~ "commentaar is volledig optioneel.Laat dit leeg als u geen commentaar wilt "
+#~ "toevoegen."
+
+#~ msgid "Comment:"
+#~ msgstr "Commentaar:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "ondertekenen, _niet comprimeren"
 

Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/pl.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpa-0.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2004-08-22 02:23+0200\n"
 "Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr ""
@@ -270,7 +270,7 @@
 msgid "a_rmor"
 msgstr "opa_kowanie ASCII"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -280,14 +280,14 @@
 "Czy chcesz go nadpisać?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Tak"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -616,16 +616,16 @@
 msgid "Can authenticate"
 msgstr "Można autoryzować"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Unieważniony"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Po terminie ważności"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -633,11 +633,11 @@
 msgid "Unsigned"
 msgstr "Brak podpisów"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Poprawny"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Nazwa użytkownika:"
@@ -646,7 +646,7 @@
 msgid "User Names:"
 msgstr "Nazwy użytkownika:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "ID klucza:"
@@ -688,7 +688,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -705,7 +705,7 @@
 "\n"
 "Działanie aplikacji zostanie za chwilę przerwane"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -725,7 +725,7 @@
 "błędem w samym GPA.\n"
 "Nastąpi teraz próba powrotu do normalnego działania GPA."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -739,7 +739,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -747,109 +747,109 @@
 "Kopia zapasowa tego klucza znajduje siÄ™ w pliku: \n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA oraz ElGamal (domyślne)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (tylko do podpisywania)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (tylko do podpisywania)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Marginalne"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Pełne"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Nieograniczone"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Niepełne"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "W pełni poprawny"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Proszę podać hasło dla następującego klucza:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Niewłaściwe hasło, proszę spróbować ponownie:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Wprowadź hasło"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Nieznany identyfikator użytkownika]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "ZÅ‚y"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "Ogólne"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "Nie sprawdzone"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Pobieżny"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "Dokładne"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Ten klucz może być użyty do wydawania certyfikatów, podpisywania i "
 "szyfrowania."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Ten klucz może być użyty do wydawania certyfikatów i podpisywania, ale nie "
 "nadaje siÄ™ do szyfrowania danych."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "Ten klucz może być użyty do wydawania certyfikatów i szyfrowania."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "Ten klucz może być użyty tylko do certyfikatów."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -857,15 +857,15 @@
 "Ten klucz może być użyty do podpisywania i szyfrowania, ale nie nadaję się "
 "do wydawania certyfikatów."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "Ten klucz może być użyty tylko do podpisywania."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "Ten klucz może być użyty tylko do szyfrowania."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "Ten klucz jest bezużyteczny."
 
@@ -988,7 +988,7 @@
 msgid "Change _expiration"
 msgstr "Zmień datę utraty _ważności"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -996,7 +996,7 @@
 "W polu \"Hasło\" i \"Powtórz hasło\",\n"
 "należy wpisać te same dane."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1004,7 +1004,7 @@
 "Nie podano hasła.\n"
 "Jest ono niezbędna do zabezpieczenia twojego klucza prywatnego."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1016,15 +1016,15 @@
 "\n"
 "Proszę wprowadzić nowe hasło."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Wprowadź nowe hasło"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Mimo wszystko użyj _tego"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Wygeneruj klucz"
 
@@ -1068,7 +1068,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Potwierdzenie hasła: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1080,15 +1080,15 @@
 "Twoje dane personalne będą częścią nowego klucza, dzięki czemu łatwiej "
 "będzie innym osobom identyfikować do kogo należy dany klucz."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Twoje imiÄ™ i nazwisko:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Proszę podać swoje imię i nazwisko"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1102,43 +1102,27 @@
 "innym osobom identyfikować do kogo należy dany klucz. Jeżeli posiadasz kilka "
 "adresów email, to będzie można dodać je później."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Twój adres email:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Proszę wprowadzić swój adres email"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Jeżeli chcesz możesz podać komentarz identyfikujący klucz. Komentarz jest "
-"szczególnie przydatny jeżeli zamierzasz wygenerować klika kluczy dla tego "
-"samego adresu email. Komentarz jest jak najbardziej opcjonalny i możesz "
-"pozostawić, to pole puste jeżeli nie zamierzasz go używać."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Komentarz:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Proszę wybrać hasło dla nowo utworzonego klucza."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Hasło: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Powtórz hasło: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1148,15 +1132,15 @@
 "Zaleca siÄ™ utworzenie kopii zapasowej klucza, zaraz po jego utworzeniu.\n"
 "Chcesz utworzyć kopię zapasową?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Utwórz kopię _zapasową"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Zrób to _później"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1167,7 +1151,7 @@
 "Nawet na szybkich komputerach może, to trochę potrwać. Prosimy zachować "
 "cierpliwość."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1823,5 +1807,19 @@
 msgid "Signatures:"
 msgstr "Podpisy:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Jeżeli chcesz możesz podać komentarz identyfikujący klucz. Komentarz jest "
+#~ "szczególnie przydatny jeżeli zamierzasz wygenerować klika kluczy dla tego "
+#~ "samego adresu email. Komentarz jest jak najbardziej opcjonalny i możesz "
+#~ "pozostawić, to pole puste jeżeli nie zamierzasz go używać."
+
+#~ msgid "Comment:"
+#~ msgstr "Komentarz:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "podpisz, bez używania kompresji"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/pt_BR.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-01-20 18:39+0100\n"
 "Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
 "Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -16,7 +16,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -276,7 +276,7 @@
 msgid "a_rmor"
 msgstr "a_rmor"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -286,14 +286,14 @@
 "Você quer sobrescrevê-lo?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Sim"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -625,16 +625,16 @@
 msgid "Can authenticate"
 msgstr ""
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Revogado"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Expirado"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -643,11 +643,11 @@
 msgid "Unsigned"
 msgstr "assinado"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Válido"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Nome do Usuário:"
@@ -656,7 +656,7 @@
 msgid "User Names:"
 msgstr "Nomes de Usuário:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "Key ID:"
@@ -698,7 +698,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -715,7 +715,7 @@
 "\n"
 "O aplicativo será encerrado"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -727,7 +727,7 @@
 "GPA will now try to recover from this error."
 msgstr ""
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -743,7 +743,7 @@
 "****************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -751,123 +751,123 @@
 "A chave copiada por segurança para este arquivo é:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA e ElGamal (default)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (assinatura somente)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (assinatura somente)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "desconhecido"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Nunca"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Moderado"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Completo"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Inteira"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Totalmente válido"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Queria indicar a senha para a seguinte chave:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Senha errada, por favor tente de novo:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Entrar com a senha"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[User ID desconhecido]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Ruim"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr ""
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr ""
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr ""
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr ""
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 #, fuzzy
 msgid "The key can be used for certification and encryption."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 #, fuzzy
 msgid "The key can be used only for certification."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 #, fuzzy
 msgid "The key can be used only for signing."
 msgstr "Nenhuma chave selecionada para assinar."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 #, fuzzy
 msgid "The key can be used only for encryption."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr ""
 
@@ -987,7 +987,7 @@
 msgid "Change _expiration"
 msgstr "Mudar _expiração"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -995,7 +995,7 @@
 "Na \"senha\" e \"Repetir a senha\",\n"
 "você deve usar a mesma senha."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1003,7 +1003,7 @@
 "Você não entrou com uma senha.\n"
 "É necessário proteger sua chave privada."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1015,15 +1015,15 @@
 "\n"
 "Por favor entre com uma nova senha."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Entre com uma nova senha"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "_Use esta assim mesmo"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Gerar chave"
 
@@ -1067,7 +1067,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Repetir senha:"
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1079,15 +1079,15 @@
 "Seu nome fará parte da nova chave para permitir aos outros identificar mais "
 "facilmente as chaves."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Seu nome:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Por favor indique o seu nome"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1101,43 +1101,27 @@
 "pessoas a identificação mais fácil das chaves. Se você tem vários e-mails, "
 "será possível adicionar outros endereços mais tarde."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Seu e-mail:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Por favor indique o seu e-mail"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Se você deseja, é possível adicionar um comentário que identifique a chave "
-"para os outros usuários. O comentário é particularmente útil se você criar "
-"várias chaves para o mesmo e-mail. O comentário é totalmente opcional. Deixe-"
-"o vazio se ele não for útil."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Comentário:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Por favor escolha uma senha para esta nova chave."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "_Senha"
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Repetir a s_enha: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1149,15 +1133,15 @@
 "\n"
 "Você deseja criar uma cópia de backup?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Criar uma _cópia de backup"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "Fazê-lo mais _tarde"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1168,7 +1152,7 @@
 "Mesmo em máquinas rápidas, isto pode demorar um pouco. Por favor seja "
 "paciente"
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1829,6 +1813,20 @@
 msgid "Signatures:"
 msgstr "Assinaturas:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Se você deseja, é possível adicionar um comentário que identifique a "
+#~ "chave para os outros usuários. O comentário é particularmente útil se "
+#~ "você criar várias chaves para o mesmo e-mail. O comentário é totalmente "
+#~ "opcional. Deixe-o vazio se ele não for útil."
+
+#~ msgid "Comment:"
+#~ msgstr "Comentário:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "assinar, não comprimir"
 

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/sv.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-01-29 16:34+0100\n"
 "Last-Translator: Mick Ohrberg <mick.ohrberg at umb.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -13,7 +13,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -274,7 +274,7 @@
 msgid "a_rmor"
 msgstr "ASCII-_förpackning"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -284,14 +284,14 @@
 "Vill du skriva över?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Ja"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -623,16 +623,16 @@
 msgid "Can authenticate"
 msgstr ""
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Ogiltigförklarat"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Giltighet upphört"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Otillämpligt"
 
@@ -641,11 +641,11 @@
 msgid "Unsigned"
 msgstr "Signera nyckel"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Giltig"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Användarnamn:"
@@ -654,7 +654,7 @@
 msgid "User Names:"
 msgstr "Användarnamn:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "Nyckelidentitet:"
@@ -696,7 +696,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -713,7 +713,7 @@
 "\n"
 "Applikation kommer nu att avslutas."
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -725,7 +725,7 @@
 "GPA will now try to recover from this error."
 msgstr ""
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -739,7 +739,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -747,123 +747,123 @@
 "Nyckeln som sparats i denna fil är:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA och ElGamal (standard)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (endast signering)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (endast signering)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Marignell"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Fullständig"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Ultimat"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Ej fullständigt"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Fullt giltig"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Ange lösen för följande nyckel:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Felaktigt lösen - försök igen:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Ange lösen"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Okänd användaridentitet]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Felaktigt"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr ""
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr ""
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr ""
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr ""
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 #, fuzzy
 msgid "The key can be used for certification and encryption."
 msgstr "och kan ej användas för kryptering."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 #, fuzzy
 msgid "The key can be used only for certification."
 msgstr "och kan ej användas för kryptering."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 #, fuzzy
 msgid "The key can be used only for signing."
 msgstr "Ingen signeringsnyckel markerad."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 #, fuzzy
 msgid "The key can be used only for encryption."
 msgstr "och kan ej användas för kryptering."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr ""
 
@@ -985,7 +985,7 @@
 msgid "Change _expiration"
 msgstr "_Ändra utgång av giltighetstid"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -993,7 +993,7 @@
 "För \"Lösen\" und \"Repetera lösen\"\n"
 "måste du ange exakt samma lösen."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1001,7 +1001,7 @@
 "Du angav inget lösen. Du behöver ett lösen för att\n"
 "skydda din privata nyckel."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1012,15 +1012,15 @@
 "\n"
 "Välj ett annat lösen."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "Mata in _nytt lösen"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Använd detta lösen _ändå"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Skapa nyckel"
 
@@ -1064,7 +1064,7 @@
 msgid "_Repeat passphrase: "
 msgstr "_Repetera lösen: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1075,15 +1075,15 @@
 "\n"
 "Andra kan använda ditt namn för att finna dun öppna nyckel."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "För- och efternamn:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Ange för- och efternamn."
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1096,42 +1096,27 @@
 "Andra kan använda din emailadress för att finna din öppna nyckel.Har du "
 "flera emailadresser kan du lägga till dem senare."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Ange emailadress:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Ange emailadress"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Om du vill kan du mata in en kommentar som kan göra din nyckel ännu enklare "
-"att finna. Detta är speciellt användbart om du har flera nycklar med samma "
-"emailadress. Om du ej önskar ha en kommentar, lämna fältet tomt. "
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Kommentar:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Välj lösen för den nya nyckeln."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Lösen: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Repetera lösen: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1143,15 +1128,15 @@
 "\n"
 "Vill du skapa en säkerhetskopia nu?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Skapa _säkerhetskopia"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "_Vänta till senare"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1161,7 +1146,7 @@
 "\n"
 "Detta kan ta tid även på kraftfulla datorer."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1806,6 +1791,20 @@
 msgid "Signatures:"
 msgstr "Signaturer:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Om du vill kan du mata in en kommentar som kan göra din nyckel ännu "
+#~ "enklare att finna. Detta är speciellt användbart om du har flera nycklar "
+#~ "med samma emailadress. Om du ej önskar ha en kommentar, lämna fältet "
+#~ "tomt. "
+
+#~ msgid "Comment:"
+#~ msgstr "Kommentar:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "Signera, komprimera _ej"
 

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/tr.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpa 0.7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2004-06-20 14:42+0300\n"
 "Last-Translator: Mert Çetin <mertc at su.sabanciuniv.edu>\n"
 "Language-Team: xTc & Déjà Vu\n"
@@ -17,7 +17,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr ""
@@ -270,7 +270,7 @@
 msgid "a_rmor"
 msgstr "_kalkan"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -280,14 +280,14 @@
 "Üzerine yazmak istiyor musunuz?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "_Evet"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -613,16 +613,16 @@
 msgid "Can authenticate"
 msgstr "Doðrulayabilir"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "Feshedilmiþ"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "Sona Ermiþ"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "Geçersiz Kýlýnmýþ"
 
@@ -630,11 +630,11 @@
 msgid "Unsigned"
 msgstr "Ýmzalanmamýþ"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "Geçerli"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "Kullanýcý Adý:"
@@ -643,7 +643,7 @@
 msgid "User Names:"
 msgstr "Kullanýcý Adlarý:"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "Anahtar Kimliði:"
@@ -685,7 +685,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -702,7 +702,7 @@
 "\n"
 "Uygulama kapatýlacaktýr"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -721,7 +721,7 @@
 "Bu büyük ihtimalle GPA'deki bir hata.\n"
 "GPA þimdi bu hatadan toparlanmaya çalýþacaktýr."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -735,7 +735,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -743,107 +743,107 @@
 "Bu dosyada yedeklenmiþ olan anahtar:\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ve ElGamal (varsayýlan)"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "DSA (sadece imzalama)"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "RSA (sadece imzalama)"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "Hiç"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "Sýnýrlý"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "Tam"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "Sonsuz"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "Eksik"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "Tamamen Geçerli"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "Lütfen þu anahtar için þifre girin:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "Hatalý þifre, lütfen tekrar deneyin:"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "Þifreyi Girin"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[Bilinmeyen kullanýcý kimliði]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "Kötü"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "Genel"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "Kiþisel"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Hafif"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "Olumlu"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Anahtar onaylama, imzalama, ve þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Anahtar onaylama ve imzalama için kullanýlabilir ama þifreleme için "
 "kullanýlamaz."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "Anahtar onaylama ve þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "Anahtar sadece onaylama için kullanýlabilir."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -851,15 +851,15 @@
 "Anahtar sadece imzalama ve þifreleme için kullanýlabilir, ama onaylama için "
 "kullanýlamaz."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "Anahtar sadece imzalama için kullanýlabilir."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "Anahtar sadece þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "Bu anahtar iþe yaramaz."
 
@@ -981,7 +981,7 @@
 msgid "Change _expiration"
 msgstr "_Bitim süresini deðiþtir"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -989,7 +989,7 @@
 "\"Þifre\" ve \"Þifre tekrar\" bölümlerinde,\n"
 "ayný þifreyi girmelisiniz."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -997,7 +997,7 @@
 "Bir þifre girmediniz.\n"
 "Bu özel þifrenizi korumak için gerekli."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1009,15 +1009,15 @@
 "\n"
 "Lütfen yeni bir þifre girin."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "_Yeni þifre gir"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "Her _durumda bunu kullan"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "Anahtar yarat"
 
@@ -1061,7 +1061,7 @@
 msgid "_Repeat passphrase: "
 msgstr "Þifre _Tekrar: "
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1073,15 +1073,15 @@
 "Ýsminiz diðerlerinin anahtarlarý tanýmasýný kolaylaþtýrmak için yeni "
 "anahtarýn bir parçasý olacaktýr."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "Ýsminiz:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "Lütfen isminizi girin"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1095,43 +1095,27 @@
 "yeni anahtarýn bir parçasý olacaktýr. Birden fazla email adresiniz varsa, "
 "daha sonra baþka email adresleri ekleyebilirsiniz."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "Email Adresiniz:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "Lütfen email adresinizi girin"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"Ýsterseniz anahtarý diðer kullanýcýlara daha çok tanýtmak için bir yorum "
-"girebilirsiniz. Özellikle ayný email adresi için birkaç anahtar yaratýrsanýz "
-"yorum girmeniz yararlý olacaktýr. Yorum bölümü tamamen isteðe baðlýdýr. "
-"Kullanmayacaksanýz boþ býrakabilirsiniz."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "Yorum:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "Lütfen yeni anahtar için bir þifre seçin."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "Þifre: "
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "Þifre Tekrar: "
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1142,15 +1126,15 @@
 "\n"
 "Yedek kopya yaratmak istiyor musunuz?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "Yedek _kopya yarat"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "So_nra yap"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1160,7 +1144,7 @@
 "\n"
 "Bu iþlem hýzlý bilgisayarlarda bile uzun sürebilir. Lütfen sabýrlý olun."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1811,5 +1795,19 @@
 msgid "Signatures:"
 msgstr "Ýmzalar:"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "Ýsterseniz anahtarý diðer kullanýcýlara daha çok tanýtmak için bir yorum "
+#~ "girebilirsiniz. Özellikle ayný email adresi için birkaç anahtar "
+#~ "yaratýrsanýz yorum girmeniz yararlý olacaktýr. Yorum bölümü tamamen "
+#~ "isteðe baðlýdýr. Kullanmayacaksanýz boþ býrakabilirsiniz."
+
+#~ msgid "Comment:"
+#~ msgstr "Yorum:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "_sýkýþtýrmadan imzala"

Modified: trunk/po/zh_TW.Big5.po
===================================================================
--- trunk/po/zh_TW.Big5.po	2006-03-20 12:35:20 UTC (rev 753)
+++ trunk/po/zh_TW.Big5.po	2006-03-21 18:50:39 UTC (rev 754)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gpa-0.7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 10:18+0100\n"
+"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
+"POT-Creation-Date: 2006-03-21 19:46+0100\n"
 "PO-Revision-Date: 2003-10-20 11:55+0200\n"
 "Last-Translator: Shell Hung <shell at linux.org.hk>\n"
 "Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -16,7 +16,7 @@
 
 #: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
 #: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
-#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/gpawizard.c:287 src/gpgmetools.c:652 src/keygendlg.c:140
 #: src/ownertrustdlg.c:110 src/passwddlg.c:98
 msgid "_Cancel"
 msgstr ""
@@ -269,7 +269,7 @@
 msgid "a_rmor"
 msgstr "¯Â¤å¦r (&r)"
 
-#: src/gpabackupop.c:215 src/gpgmetools.c:130
+#: src/gpabackupop.c:215 src/gpgmetools.c:137
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -279,14 +279,14 @@
 "­n¶i¦æÂмg¶Ü?"
 
 #: src/gpabackupop.c:218 src/gpaexportserverop.c:132
-#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:140
 #: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
 #: src/settingsdlg.c:136
 msgid "_Yes"
 msgstr "¬O (&Y)"
 
 #: src/gpabackupop.c:219 src/gpaexportserverop.c:133
-#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:141
 #: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
 #: src/settingsdlg.c:139
 msgid "_No"
@@ -610,16 +610,16 @@
 msgid "Can authenticate"
 msgstr "¤¹³\µo©ñ"
 
-#: src/gpasubkeylist.c:135 src/gpgmetools.c:568 src/gpgmetools.c:753
-#: src/gpgmetools.c:872
+#: src/gpasubkeylist.c:135 src/gpgmetools.c:575 src/gpgmetools.c:760
+#: src/gpgmetools.c:879
 msgid "Revoked"
 msgstr "²¾°£"
 
-#: src/gpasubkeylist.c:139 src/gpgmetools.c:570 src/gpgmetools.c:868
+#: src/gpasubkeylist.c:139 src/gpgmetools.c:577 src/gpgmetools.c:875
 msgid "Expired"
 msgstr "¤w¸g¹L®É"
 
-#: src/gpasubkeylist.c:143 src/gpgmetools.c:572
+#: src/gpasubkeylist.c:143 src/gpgmetools.c:579
 msgid "Disabled"
 msgstr "¤w¸g¥¢®Ä"
 
@@ -627,11 +627,11 @@
 msgid "Unsigned"
 msgstr "¨S¦³Ã±¸p"
 
-#: src/gpasubkeylist.c:151 src/gpgmetools.c:859 src/verifydlg.c:214
+#: src/gpasubkeylist.c:151 src/gpgmetools.c:866 src/verifydlg.c:214
 msgid "Valid"
 msgstr "¥¿½T"
 
-#: src/gpawidgets.c:74 src/gpgmetools.c:610 src/gpgmetools.c:617
+#: src/gpawidgets.c:74 src/gpgmetools.c:617 src/gpgmetools.c:624
 #: src/keyring.c:1158 src/keysigndlg.c:106
 msgid "User Name:"
 msgstr "¥ÎªÌ¦WºÙ :"
@@ -640,7 +640,7 @@
 msgid "User Names:"
 msgstr "¥ÎªÌ¦WºÙ :"
 
-#: src/gpawidgets.c:80 src/gpgmetools.c:611 src/gpgmetools.c:618
+#: src/gpawidgets.c:80 src/gpgmetools.c:618 src/gpgmetools.c:625
 #: src/keyring.c:1160
 msgid "Key ID:"
 msgstr "±KÆ_ ID:"
@@ -682,7 +682,7 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpgmetools.c:51
+#: src/gpgmetools.c:58
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -699,7 +699,7 @@
 "\n"
 "µ{¦¡·|³Q²×¤î"
 
-#: src/gpgmetools.c:65
+#: src/gpgmetools.c:72
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -717,7 +717,7 @@
 "\n"
 "³o¦³¥i¯à¬O GPA µ{¦¡ªº°ÝÃD.nGPA ²{¦b¹Á¸Õ±q¿ù»~¤¤¦^´_."
 
-#: src/gpgmetools.c:437
+#: src/gpgmetools.c:444
 msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
@@ -731,7 +731,7 @@
 "****************************************\n"
 "\n"
 
-#: src/gpgmetools.c:442
+#: src/gpgmetools.c:449
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -739,119 +739,119 @@
 "¤w³Æ¥÷ªºÆ_¹ï¦bÀɮתº¬O :\n"
 "\n"
 
-#: src/gpgmetools.c:501
+#: src/gpgmetools.c:508
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ¤Î EIGamal (¹w³])"
 
-#: src/gpgmetools.c:502
+#: src/gpgmetools.c:509
 msgid "DSA (sign only)"
 msgstr "¥uñ¸pªºDSA"
 
-#: src/gpgmetools.c:503
+#: src/gpgmetools.c:510
 msgid "RSA (sign only)"
 msgstr "¥uñ¸pªº RSA"
 
-#: src/gpgmetools.c:536 src/gpgmetools.c:559 src/gpgmetools.c:576
-#: src/gpgmetools.c:864 src/gpgmetools.c:897
+#: src/gpgmetools.c:543 src/gpgmetools.c:566 src/gpgmetools.c:583
+#: src/gpgmetools.c:871 src/gpgmetools.c:904
 msgid "Unknown"
 msgstr "¤£ª¾¦W"
 
-#: src/gpgmetools.c:539
+#: src/gpgmetools.c:546
 msgid "Never"
 msgstr "¥Ã¤£«H¥ô"
 
-#: src/gpgmetools.c:542
+#: src/gpgmetools.c:549
 msgid "Marginal"
 msgstr "³¡¥÷«H¥ô"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:552
 msgid "Full"
 msgstr "§¹¥þ«H¥ô"
 
-#: src/gpgmetools.c:548
+#: src/gpgmetools.c:555
 msgid "Ultimate"
 msgstr "¥Ã»·«H¥ô"
 
-#: src/gpgmetools.c:574
+#: src/gpgmetools.c:581
 msgid "Incomplete"
 msgstr "¤£§¹¾ãªº"
 
-#: src/gpgmetools.c:580
+#: src/gpgmetools.c:587
 msgid "Fully Valid"
 msgstr "§¹¥þ¦Xªkªº"
 
-#: src/gpgmetools.c:608
+#: src/gpgmetools.c:615
 msgid "Please enter the passphrase for the following key:"
 msgstr "¿é¤J¥H¤U±KÆ_ªº±K½X:"
 
-#: src/gpgmetools.c:616
+#: src/gpgmetools.c:623
 msgid "Wrong passphrase, please try again:"
 msgstr "±K½X¿ù»~, ½Ð¦A¹Á¸Õ :"
 
-#: src/gpgmetools.c:641
+#: src/gpgmetools.c:648
 msgid "Enter Passphrase"
 msgstr "¿é¤J±K½X"
 
-#: src/gpgmetools.c:746
+#: src/gpgmetools.c:753
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:836 src/verifydlg.c:271
+#: src/gpgmetools.c:843 src/verifydlg.c:271
 msgid "[Unknown user ID]"
 msgstr "[¤£¦W¥ÎªÌID]"
 
-#: src/gpgmetools.c:862 src/verifydlg.c:219
+#: src/gpgmetools.c:869 src/verifydlg.c:219
 msgid "Bad"
 msgstr "¤£¦Xªkªº"
 
-#: src/gpgmetools.c:885
+#: src/gpgmetools.c:892
 msgid "Generic"
 msgstr "³q¥Î"
 
-#: src/gpgmetools.c:888
+#: src/gpgmetools.c:895
 msgid "Persona"
 msgstr "¨p¥Î"
 
-#: src/gpgmetools.c:891
+#: src/gpgmetools.c:898
 msgid "Casual"
 msgstr "Á{®É"
 
-#: src/gpgmetools.c:894
+#: src/gpgmetools.c:901
 msgid "Positive"
 msgstr "½T©w"
 
-#: src/gpgmetools.c:912
+#: src/gpgmetools.c:919
 msgid "The key can be used for certification, signing and encryption."
 msgstr "±KÆ_¥i³Q¥Î§@ÅçÃÒ, ñ¸p¤Î¥[±K."
 
-#: src/gpgmetools.c:915
+#: src/gpgmetools.c:922
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "±KÆ_¥i³Q¥Î§@ÅçÃÒ¤Îñ¸p, ¨Ã¤£¤¹³\¥Î¦b¥[±K¤W."
 
-#: src/gpgmetools.c:921
+#: src/gpgmetools.c:928
 msgid "The key can be used for certification and encryption."
 msgstr "±KÆ_¥i¥Î§@ÅçÃҤΥ[±K."
 
-#: src/gpgmetools.c:924
+#: src/gpgmetools.c:931
 msgid "The key can be used only for certification."
 msgstr "±KÆ_¥u¥i¥Î§@ÅçÃÒ."
 
-#: src/gpgmetools.c:932
+#: src/gpgmetools.c:939
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "±KÆ_¥u¥i¥H³Q¥Î§@ñ¸p¤Î¥[±K.¨Ã¤£¤¹³\¥Î¦bÅçÃҥγ~."
 
-#: src/gpgmetools.c:935
+#: src/gpgmetools.c:942
 msgid "The key can be used only for signing."
 msgstr "±KÆ_¥u¥i¥Î§@ñ¸p."
 
-#: src/gpgmetools.c:940
+#: src/gpgmetools.c:947
 msgid "The key can be used only for encryption."
 msgstr "±KÆ_¥u¥i¥Î§@¥[±K."
 
-#: src/gpgmetools.c:943
+#: src/gpgmetools.c:950
 msgid "This key is useless."
 msgstr "±KÆ_¬O¤£¥i¨Ï¥Îªº."
 
@@ -969,7 +969,7 @@
 msgid "Change _expiration"
 msgstr "§ïÅܦ³®Ä¤é´Á (&E)"
 
-#: src/keygendlg.c:54 src/keygenwizard.c:321 src/passwddlg.c:43
+#: src/keygendlg.c:54 src/keygenwizard.c:305 src/passwddlg.c:43
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -977,7 +977,7 @@
 "¦b \"±K½X\"¤Î\"­«½Æ±K½X\",\n"
 "±z»Ý­n¿é¤J¬Û¦Pªº±K½X."
 
-#: src/keygendlg.c:61 src/keygenwizard.c:328 src/passwddlg.c:50
+#: src/keygendlg.c:61 src/keygenwizard.c:312 src/passwddlg.c:50
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -985,7 +985,7 @@
 "±z¨Ã¨S¦³¿é¤J±K½X.\n"
 "³o­Ó±K½X¬O»Ý­n¥Î§@«OÅ@±KÆ_ªº."
 
-#: src/keygendlg.c:74 src/keygenwizard.c:342 src/passwddlg.c:63
+#: src/keygendlg.c:74 src/keygenwizard.c:326 src/passwddlg.c:63
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -997,15 +997,15 @@
 "\n"
 "½Ð¿é¤J·sªº±K½X."
 
-#: src/keygendlg.c:79 src/keygenwizard.c:347 src/passwddlg.c:68
+#: src/keygendlg.c:79 src/keygenwizard.c:331 src/passwddlg.c:68
 msgid "_Enter new passphrase"
 msgstr "¿é¤J·s±K½X (&E)"
 
-#: src/keygendlg.c:80 src/keygenwizard.c:348 src/passwddlg.c:69
+#: src/keygendlg.c:80 src/keygenwizard.c:332 src/passwddlg.c:69
 msgid "Take this one _anyway"
 msgstr "±j¦æ¨Ï¥Î³o­Ó±K½X (&A)"
 
-#: src/keygendlg.c:135 src/keygenwizard.c:556
+#: src/keygendlg.c:135 src/keygenwizard.c:539
 msgid "Generate key"
 msgstr "«Ø¥ß·sÆ_"
 
@@ -1049,7 +1049,7 @@
 msgid "_Repeat passphrase: "
 msgstr "­«½Æ±K½X (&R):"
 
-#: src/keygenwizard.c:151
+#: src/keygenwizard.c:150
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1060,15 +1060,15 @@
 "\n"
 "³o­Ó¦W¦r·|¬OÆ_ªº¤@³¡¥÷¨Ï¨ä¥L¤H®e©ö¿ë»{±zªº±KÆ_."
 
-#: src/keygenwizard.c:156
+#: src/keygenwizard.c:155
 msgid "Your Name:"
 msgstr "±zªº¦W¦r:"
 
-#: src/keygenwizard.c:169
+#: src/keygenwizard.c:168
 msgid "Please insert your name"
 msgstr "½Ð¿é¤J±zªº¦W¦r"
 
-#: src/keygenwizard.c:182
+#: src/keygenwizard.c:181
 msgid ""
 "Please insert your email address.\n"
 "\n"
@@ -1081,41 +1081,27 @@
 "±zªº¹q¶l¦a§}·|¬OÆ_ªº¤@³¡¥÷¨Ï¨ä¥L¤H®e©ö¿ë»{±z. ¦pªG±z¦³¦h­Ó¹q¶l¦a§}, ±z¥i¥H¦b"
 "¤é«á¦A¼W¥[."
 
-#: src/keygenwizard.c:189
+#: src/keygenwizard.c:188
 msgid "Your Email Address:"
 msgstr "±zªº¹q¶l¦a§}:"
 
-#: src/keygenwizard.c:204
+#: src/keygenwizard.c:203
 msgid "Please insert your email address"
 msgstr "½Ð¿é¤J±zªº¹q©Ò¦a§}"
 
-#: src/keygenwizard.c:221
-msgid ""
-"If you want you can supply a comment that further identifies the key to "
-"other users. The comment is especially useful if you generate several keys "
-"for the same email address. The comment is completely optional. Leave it "
-"empty if you don't have a use for it."
-msgstr ""
-"¦p±z³ßÅw, ±z¥ç¥i¦P®É´£¨Ñ¤@¬q³Æµù¥H¹ï¨ä¥L¤H»¡©ú³o±ø±KÆ_. ³o­Ó³Æµù¦b¦pªG±z«Ø¥ß"
-"¦h­Ó¦P¤@¹q¶l®É«Ü¦³¥Î, ¤£¹L¥ç¥u¬O¿ï¾Ü©Ê´£¨Ñ, ¦pªG±z¤£¥´ºâ¿é¤J, ¥i¥H§â¥¦¯dªÅ."
-
-#: src/keygenwizard.c:227
-msgid "Comment:"
-msgstr "³Æµù:"
-
-#: src/keygenwizard.c:253
+#: src/keygenwizard.c:237
 msgid "Please choose a passphrase for the new key."
 msgstr "½Ð¿é¤J·sÆ_ªº±K½X."
 
-#: src/keygenwizard.c:262 src/passwddlg.c:106
+#: src/keygenwizard.c:246 src/passwddlg.c:106
 msgid "Passphrase: "
 msgstr "±K½X :"
 
-#: src/keygenwizard.c:275 src/passwddlg.c:115
+#: src/keygenwizard.c:259 src/passwddlg.c:115
 msgid "Repeat Passphrase: "
 msgstr "­«½Æ±K½X :"
 
-#: src/keygenwizard.c:372
+#: src/keygenwizard.c:356
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1126,15 +1112,15 @@
 "\n"
 "±z¬O§_·Q»s§@¤@­Ó³Æ¥÷?"
 
-#: src/keygenwizard.c:381
+#: src/keygenwizard.c:365
 msgid "Create _backup copy"
 msgstr "«Ø¥ß³Æ¥÷ (&b)"
 
-#: src/keygenwizard.c:388 src/keyring.c:709 src/keyring.c:737
+#: src/keygenwizard.c:372 src/keyring.c:709 src/keyring.c:737
 msgid "Do it _later"
 msgstr "©¹«á¤~¶i¦æ (&l)"
 
-#: src/keygenwizard.c:416
+#: src/keygenwizard.c:400
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1144,7 +1130,7 @@
 "\n"
 "¦b§ó§Öªº¹q¸£¤W¤]¥i¯à­nµ¥«J¤@¬q®É¶¡. ½Ðµ¥«J..."
 
-#: src/keygenwizard.c:425
+#: src/keygenwizard.c:409
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1777,5 +1763,18 @@
 msgid "Signatures:"
 msgstr "ñ¸p"
 
+#~ msgid ""
+#~ "If you want you can supply a comment that further identifies the key to "
+#~ "other users. The comment is especially useful if you generate several "
+#~ "keys for the same email address. The comment is completely optional. "
+#~ "Leave it empty if you don't have a use for it."
+#~ msgstr ""
+#~ "¦p±z³ßÅw, ±z¥ç¥i¦P®É´£¨Ñ¤@¬q³Æµù¥H¹ï¨ä¥L¤H»¡©ú³o±ø±KÆ_. ³o­Ó³Æµù¦b¦pªG±z«Ø"
+#~ "¥ß¦h­Ó¦P¤@¹q¶l®É«Ü¦³¥Î, ¤£¹L¥ç¥u¬O¿ï¾Ü©Ê´£¨Ñ, ¦pªG±z¤£¥´ºâ¿é¤J, ¥i¥H§â¥¦¯d"
+#~ "ªÅ."
+
+#~ msgid "Comment:"
+#~ msgstr "³Æµù:"
+
 #~ msgid "sign, do_n't compress"
 #~ msgstr "ñ¸p¦ý¤£À£ÁY (&n)"